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 61f73a2..e2fb9d8 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1216,6 +1216,7 @@ public class CartService { TbCashierCart seatInfo = null; Integer orderId = null; for (TbCashierCart tbCashierCart : allCartList) { + tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType()); cashierIds.add(tbCashierCart.getId()); // 设置会员信息及价格 if (shopUser.getIsVip() == 0) { 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 ff16829..110bd5d 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -622,12 +622,12 @@ public class PayService { //更新购物车状态 int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper() .eq(TbCashierCart::getOrderId, orderId) - .eq(TbCashierCart::getUseType, orderInfo.getUseType()) - .in(TbCashierCart::getStatus, "create", "closed") +// .eq(TbCashierCart::getUseType, orderInfo.getUseType()) +// .in(TbCashierCart::getStatus, "create", "closed") .set(TbCashierCart::getStatus, "final")); mpOrderDetailMapper.update(null, new LambdaUpdateWrapper().eq(TbOrderDetail::getId, orderId) - .eq(TbOrderDetail::getUseType, orderInfo.getUseType()) +// .eq(TbOrderDetail::getUseType, orderInfo.getUseType()) .eq(TbOrderDetail::getStatus, "unpaid") .set(TbOrderDetail::getStatus, "closed"));