czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 订单折扣金额保存不正确修复

Browse Source
This commit is contained in:
张松
2024-11-23 13:38:42 +08:00
parent e1b4e2500a
commit aa86e2a7d6
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@@ -1218,11 +1218,20 @@ public class CartService {
outRecords.add(tbActivateOutRecord); outRecords.add(tbActivateOutRecord);
cashierCart.setUseCouponInfo(JSONObject.toJSONString(tbActivateOutRecord)); cashierCart.setUseCouponInfo(JSONObject.toJSONString(tbActivateOutRecord));
couponVo.setFinalDiscountAmount(discountAmount);
// 优惠券未消耗完毕 // 优惠券未消耗完毕
if (balanceCart != null && getCanUseCoupon(couponMap, balanceCart.getProductId()) != null) { 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;
} }
return discountAmount; return discountAmount;
@@ -1260,6 +1269,7 @@ public class CartService {
resetCouponList.add(cashierCart); resetCouponList.add(cashierCart);
cashierCart.setUserCouponId(null); cashierCart.setUserCouponId(null);
} }
cashierCart.resetTotalAmount();
discountAmount = reduceProCoupon(couponMap, cashierCart, usedCouponMap, discountAmount, balanceCartList, outRecords, memberId); discountAmount = reduceProCoupon(couponMap, cashierCart, usedCouponMap, discountAmount, balanceCartList, outRecords, memberId);
} }