diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 0311078..7779af2 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -783,6 +783,11 @@ public class OrderService { cashierCart.setPlaceNum(currentPlaceNum); } + // 先付费模式,结束购物车状态 + if (eatTypeInfoDTO.isDineInBefore() || eatTypeInfoDTO.isTakeout()) { + cashierCart.setStatus("final"); + } + TbOrderDetail orderDetail = null; if (StrUtil.isNotBlank(cashierCart.getOrderId())) { orderDetail = oldOrderDetailMap.get(cashierCart.getOrderId() + cashierCart.getId()); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index cd3a9dd..78082ca 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -338,6 +338,7 @@ public class PayService { orderInfo.setStatus("paying"); orderInfo.setPayOrderNo(payment.getTradeNumber()); tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo); + int cartCount = tbCashierCartMapper.updateByOrderId(orderId, "final"); payment.setUpdatedAt(System.currentTimeMillis()); tbOrderPaymentMapper.updateByPrimaryKeySelective(payment); @@ -429,6 +430,7 @@ public class PayService { orderInfo.setStatus("paying"); orderInfo.setPayOrderNo(payment.getTradeNumber()); tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo); + int cartCount = tbCashierCartMapper.updateByOrderId(orderId, "final"); payment.setUpdatedAt(System.currentTimeMillis());