From 26f6af0256775242f58b7d044c90f0f8f689666f Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 30 Aug 2024 15:27:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/ysk/cashier/dto/shoptable/AddCartDTO.java   | 1 +
 .../service/impl/shopimpl/TbShopTableServiceImpl.java        | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/AddCartDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/AddCartDTO.java
index 4df8affc..7508701f 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/AddCartDTO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/AddCartDTO.java
@@ -24,4 +24,5 @@ public class AddCartDTO {
     private Integer num;
     private boolean isPack;
     private boolean isGift;
+    private Integer cartId;
 }
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 74a809d1..ba014126 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
@@ -330,6 +330,11 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                                         .eq(TbCashierCart::getMasterId, "");
                             }));
                 });
+
+        if (addCartDTO.getCartId() != null) {
+            query.eq(TbCashierCart::getId, addCartDTO.getCartId());
+        }
+
         TbCashierCart tbCashierCart = cashierCartMapper.selectOne(query);
         // 首次加入
         if (tbCashierCart == null) {