From 94285f68d03cbd5d2b003da38795a0130dc5c29c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 26 Nov 2024 13:43:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=201.=E5=8D=95=E5=93=81=E6=94=B9=E4=BB=B7?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/TbCashierCart.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
index f53a3e9..9847dae 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
@@ -100,11 +100,14 @@ public class TbCashierCart implements Serializable {
         if ("true".equals(isGift)) {
             totalAmount = packFee;
         } else {
+            discountSaleAmount = discountSaleAmount == null ? BigDecimal.ZERO : discountSaleAmount;
+            BigDecimal subtract;
             if (isMember != null && isMember == 1 && memberPrice != null && memberPrice.compareTo(BigDecimal.ZERO) > 0) {
-                totalAmount = totalNumber.multiply(memberPrice).add(packFee);
+                subtract = memberPrice.subtract(discountSaleAmount);
             } else {
-                totalAmount = totalNumber.multiply(discountSaleAmount != null ? discountSaleAmount : salePrice).add(packFee);
+                subtract = salePrice.subtract(discountSaleAmount);
             }
+            totalAmount = totalNumber.multiply(subtract.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : subtract).add(packFee);
         }
     }