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 14:55:41 +08:00
parent aa86e2a7d6
commit b8d5195622
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1217,6 +1217,7 @@ public class CartService {
tbActivateOutRecord.setRefNum(0); tbActivateOutRecord.setRefNum(0);
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) {
@@ -1231,7 +1232,6 @@ public class CartService {
memberId memberId
)); ));
} }
couponVo.setFinalDiscountAmount(discountAmount);
return discountAmount; return discountAmount;
} }
return discountAmount; return discountAmount;
@@ -1270,7 +1270,7 @@ public class CartService {
cashierCart.setUserCouponId(null); cashierCart.setUserCouponId(null);
} }
cashierCart.resetTotalAmount(); 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()) { if (!balanceCartList.isEmpty()) {