From b8d5195622724de3273d9561c8367d69d0612a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Sat, 23 Nov 2024 14:55:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E9=87=91=E9=A2=9D=E4=B8=8D=E5=87=86=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/CartService.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index 6bb99eb..3c79e7a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -1217,6 +1217,7 @@ public class CartService {
             tbActivateOutRecord.setRefNum(0);
             outRecords.add(tbActivateOutRecord);
             cashierCart.setUseCouponInfo(JSONObject.toJSONString(tbActivateOutRecord));
+            couponVo.setFinalDiscountAmount(discountAmount);
 
             // 优惠券未消耗完毕
             if (balanceCart != null && getCanUseCoupon(couponMap, balanceCart.getProductId()) != null) {
@@ -1231,7 +1232,6 @@ public class CartService {
                         memberId
                 ));
             }
-            couponVo.setFinalDiscountAmount(discountAmount);
             return discountAmount;
         }
         return discountAmount;
@@ -1270,7 +1270,7 @@ public class CartService {
                 cashierCart.setUserCouponId(null);
             }
             cashierCart.resetTotalAmount();
-            discountAmount = reduceProCoupon(couponMap, cashierCart, usedCouponMap, discountAmount, balanceCartList, outRecords, memberId);
+            discountAmount = discountAmount.add(reduceProCoupon(couponMap, cashierCart, usedCouponMap, BigDecimal.ZERO, balanceCartList, outRecords, memberId));
         }
 
         if (!balanceCartList.isEmpty()) {