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

fix: 折扣金额修复

Browse Source
This commit is contained in:
张松
2024-11-21 16:41:18 +08:00
parent 1e6981cfb9
commit dcaf9f4adb
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -1337,11 +1337,20 @@ public class TbShopTableServiceImpl implements TbShopTableService {
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;