From 01cc98543b288fc0aaffc6d63fb84230006db48d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 8 Nov 2024 10:02:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/CartService.java          | 1 +
 .../system/cashierservice/service/PayService.java           | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

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<TbCashierCart>()
                 .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<TbOrderDetail>().eq(TbOrderDetail::getId, orderId)
-                .eq(TbOrderDetail::getUseType, orderInfo.getUseType())
+//                .eq(TbOrderDetail::getUseType, orderInfo.getUseType())
                 .eq(TbOrderDetail::getStatus, "unpaid")
                 .set(TbOrderDetail::getStatus, "closed"));