From b12f6ae8234437b162abca8c32173fc122741c2a Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 18 Oct 2024 17:27:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=8F=96=E6=B6=88=E8=B5=A0?=
 =?UTF-8?q?=E9=80=81fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java | 4 ++--
 1 file changed, 2 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 fbf0a37b..cfbb1be2 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
@@ -382,8 +382,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             tbCashierCart.setIsPack(updateCartDTO.getIsPack() ? "true" : "false");
         }
 
-        if (updateCartDTO.getIsGift() != null && updateCartDTO.getIsGift()) {
-            tbCashierCart.setTotalAmount(BigDecimal.ZERO);
+        if (updateCartDTO.getIsGift() != null ) {
+            tbCashierCart.setTotalAmount(updateCartDTO.getIsGift() ? BigDecimal.ZERO : tbCashierCart.getTotalAmount());
             tbCashierCart.setIsGift(updateCartDTO.getIsGift() ? "true" : "false");
         }