From aa86e2a7d61ec712942ead5142a2879601375270 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 13:38:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E6=8A=98=E6=89=A3?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E4=BF=9D=E5=AD=98=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/CartService.java | 14 ++++++++++++--
 1 file changed, 12 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 86596e9..6bb99eb 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -1218,11 +1218,20 @@ public class CartService {
             outRecords.add(tbActivateOutRecord);
             cashierCart.setUseCouponInfo(JSONObject.toJSONString(tbActivateOutRecord));
 
-            couponVo.setFinalDiscountAmount(discountAmount);
             // 优惠券未消耗完毕
             if (balanceCart != null && getCanUseCoupon(couponMap, balanceCart.getProductId()) != null) {
-                discountAmount = reduceProCoupon(couponMap, balanceCart, usedCouponMap, discountAmount, balanceCartList, outRecords, memberId);
+                // 递归调用并累加递归返回的折扣金额
+                discountAmount = discountAmount.add(reduceProCoupon(
+                        couponMap,
+                        balanceCart,
+                        usedCouponMap,
+                        BigDecimal.ZERO, // 避免重复累加，递归时传入新的初始值
+                        balanceCartList,
+                        outRecords,
+                        memberId
+                ));
             }
+            couponVo.setFinalDiscountAmount(discountAmount);
             return discountAmount;
         }
         return discountAmount;
@@ -1260,6 +1269,7 @@ public class CartService {
                 resetCouponList.add(cashierCart);
                 cashierCart.setUserCouponId(null);
             }
+            cashierCart.resetTotalAmount();
             discountAmount = reduceProCoupon(couponMap, cashierCart, usedCouponMap, discountAmount, balanceCartList, outRecords, memberId);
         }