From 3f747743b1ec5b6e79a7d777a1b6f34f310957c7 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, 20 Dec 2024 10:15:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E9=80=80=E5=8D=95=E6=B8=85=E7=A9=BA=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/shopimpl/TbShopTableServiceImpl.java        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index a8898860..129a22ab 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -938,11 +938,19 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         if (TableConstant.OrderInfo.UseType.TAKEOUT.equalsVals(cashierCart.getUseType())) {
             return;
         }
-        List<TbCashierCart> cashierCarts = mpCashierCartService.selectByShopEatTypeAndOrderId(shopEatTypeInfoDTO, cashierCart.getMasterId(), cashierCart.getOrderId() == null ? null : cashierCart.getOrderId(), false, TableConstant.OrderInfo.Status.CREATE);
-        if (cashierCarts.isEmpty() && cashierCart.getOrderId() != null) {
+        List<TbCashierCart> cashierCarts = mpCashierCartService.selectByShopEatTypeAndOrderId(shopEatTypeInfoDTO, cashierCart.getMasterId(), cashierCart.getOrderId() == null ? null : cashierCart.getOrderId(), false);
+        int activateCount = 0;
+        ArrayList<Integer> cartIds = new ArrayList<>();
+        for (TbCashierCart item : cashierCarts) {
+            if (TableConstant.OrderInfo.Status.CREATE.equalsVals(item.getStatus())) {
+                activateCount++;
+            }
+        }
+        if (activateCount == 0 && cashierCart.getOrderId() != null) {
             mpOrderDetailService.remove(new LambdaQueryWrapper<TbOrderDetail>()
                     .eq(TbOrderDetail::getOrderId, cashierCart.getOrderId()));
             mpOrderInfoService.removeById(cashierCart.getOrderId());
+            mpCashierCartService.removeByIds(cashierCarts);
         }
     }