From ad27d30d4e33db2969c2a68fee3af895259a18fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 4 Dec 2024 11:08:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B5=A0=E9=80=81=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BB=B7=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java        | 5 +++++
 1 file changed, 5 insertions(+)

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 e46e57b8..7a15b760 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
@@ -483,6 +483,11 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         if (updateCartDTO.getIsGift() != null) {
             tbCashierCart.setTotalAmount(updateCartDTO.getIsGift() ? tbCashierCart.getPackFee() : tbCashierCart.getTotalAmount());
             tbCashierCart.setIsGift(updateCartDTO.getIsGift() ? "true" : "false");
+            tbCashierCart.setDiscountSaleAmount(BigDecimal.ZERO);
+            if (updateCartDTO.getIsGift()) {
+                tbCashierCart.setDiscountSaleNote("");
+                tbCashierCart.resetTotalAmount();
+            }
         }
 
         tbCashierCart.setTotalNumber(updateCartDTO.getNum());