diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index 960752e..7c2b009 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1144,7 +1144,7 @@ public class CartService { } cashierCart.setUpdatedAt(System.currentTimeMillis()); cashierCart.setOrderId(orderId + ""); - if (!shopEatTypeInfoDTO.isDineInAfter()) { + if (TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId()) && !shopEatTypeInfoDTO.isDineInAfter()) { cashierCart.setStatus("closed"); } cashierCart.setPlaceNum(cashierCart.getPlaceNum() == null ? currentPlaceNum : cashierCart.getPlaceNum()); 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 77f88e9..427938b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -468,7 +468,7 @@ public class PayService { int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper() .eq(TbCashierCart::getOrderId, orderId) .eq(TbCashierCart::getUseType, orderInfo.getUseType()) - .eq(TbCashierCart::getStatus, "create") + .in(TbCashierCart::getStatus, "create", "closed") .set(TbCashierCart::getStatus, "final")); mpOrderDetailMapper.update(null, new LambdaUpdateWrapper().eq(TbOrderDetail::getId, orderId) @@ -1076,7 +1076,7 @@ public class PayService { int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper() .eq(TbCashierCart::getOrderId, orderInfo.getId()) .eq(TbCashierCart::getUseType, orderInfo.getUseType()) - .eq(TbCashierCart::getStatus, "create") + .in(TbCashierCart::getStatus, "create", "closed") .set(TbCashierCart::getStatus, "final")); log.info("更新购物车:{}", cartCount); @@ -1084,7 +1084,7 @@ public class PayService { mpOrderDetailMapper.update(null, new LambdaUpdateWrapper().eq(TbOrderDetail::getId, orderInfo.getId()) .eq(TbOrderDetail::getUseType, orderInfo.getUseType()) - .eq(TbOrderDetail::getStatus, "unpaid") + .in(TbOrderDetail::getStatus, "unpaid") .set(TbOrderDetail::getStatus, "closed")); //修改主单状态