czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

取消不报错

Browse Source
This commit is contained in:
wangw
2025-11-12 13:42:42 +08:00
parent 481b0202da
commit fcc33b28e1
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderDetailServiceImpl.java
View File

@@ -31,7 +31,7 @@ public class OrderDetailServiceImpl extends ServiceImpl<OrderDetailMapper, Order
@Override @Override
public void updateOrderDetailStatus(Long orderId,String status) { public void updateOrderDetailStatus(Long orderId,String status) {
OrderDetail orderDetail = getById(orderId); OrderDetail orderDetail = new OrderDetail();
orderDetail.setStatus(status); orderDetail.setStatus(status);
update(orderDetail, QueryWrapper.create() update(orderDetail, QueryWrapper.create()
.eq(OrderDetail::getOrderId,orderId) .eq(OrderDetail::getOrderId,orderId)

12
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -1599,10 +1599,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
public Boolean cancelledOrder(Long shopId, Long orderId) throws OrderCancelException { public Boolean cancelledOrder(Long shopId, Long orderId) throws OrderCancelException {
OrderInfo orderInfo = getById(orderId); OrderInfo orderInfo = getById(orderId);
if (orderInfo == null) { if (orderInfo == null) {
throw new OrderCancelException("订单不存在"); // throw new OrderCancelException("订单不存在");
return true;
} }
if (!OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus())) { if (!OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus())) {
throw new OrderCancelException("订单不可取消"); // throw new OrderCancelException("订单不可取消");
return true;
} }
updateChain() updateChain()
.set(OrderInfo::getStatus, OrderStatusEnums.CANCELLED.getCode()) .set(OrderInfo::getStatus, OrderStatusEnums.CANCELLED.getCode())
@@ -1636,10 +1638,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
public Boolean cancelledPlaceOrder(Long shopId, Long orderId, Integer placeNum) { public Boolean cancelledPlaceOrder(Long shopId, Long orderId, Integer placeNum) {
OrderInfo orderInfo = getById(orderId); OrderInfo orderInfo = getById(orderId);
if (orderInfo == null) { if (orderInfo == null) {
throw new OrderCancelException("订单不存在"); // throw new OrderCancelException("订单不存在");
return true;
} }
if (!OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus())) { if (!OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus())) {
throw new OrderCancelException("订单不可取消"); // throw new OrderCancelException("订单不可取消");
return true;
} }
if (orderInfo.getPlaceNum().equals(1)) { if (orderInfo.getPlaceNum().equals(1)) {
updateChain() updateChain()