From c3409461c85223c741123a05961f1c231c6b3ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 21 Nov 2024 18:19:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=98=E6=89=A3=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java | 3 +++
 .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
index b83a735e..caef29d2 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
@@ -204,6 +204,9 @@ public class TbCashierCart implements Serializable {
      * 根据是否会员充值价格
      */
     public void resetTotalAmount(BigDecimal discountRadio) {
+        if (discountRadio == null) {
+            discountRadio = BigDecimal.ONE;
+        }
         if ("false".equals(isPack)) {
             packFee = BigDecimal.ZERO;
         }
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 d11b2e77..d78f59fc 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
@@ -1582,7 +1582,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             if (orderInfo != null && shopEatTypeInfoDTO != null) {
                 cashierCart.setIsMember(StrUtil.isBlank(orderInfo.getMemberId()) ? 0 : shopEatTypeInfoDTO.isMemberPrice() ? 1 : 0);
             }
-            cashierCart.resetTotalAmount();
+            cashierCart.resetTotalAmount(orderInfo == null ? null : orderInfo.getDiscountRatio());
 
             // 已经退款和使用优惠券的商品不进行统计金额
             if (!"return".equals(cashierCart.getStatus()) && cashierCart.getUserCouponId() == null) {