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-15 14:04:55 +08:00
parent 7d2f08b605
commit d22a4bb9f5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1189,7 +1189,7 @@ public class CartService {
tbActivateOutRecord.setRefNum(0); tbActivateOutRecord.setRefNum(0);
outRecords.add(tbActivateOutRecord); outRecords.add(tbActivateOutRecord);
couponVo.setCurrentDiscountAmount(couponVo.getCurrentDiscountAmount().add(couponVo.getCurrentDiscountAmount())); couponVo.setCurrentDiscountAmount(couponVo.getCurrentDiscountAmount().add(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 = reduceProCoupon(couponMap, balanceCart, usedCouponMap, discountAmount, balanceCartList, outRecords, memberId);
@@ -1404,7 +1404,10 @@ public class CartService {
couponInfo.setProductCouponMap(BeanUtil.copyProperties(couponInfo.getProductCouponMap(), HashMap.class)); couponInfo.setProductCouponMap(BeanUtil.copyProperties(couponInfo.getProductCouponMap(), HashMap.class));
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("outRecordList", couponInfo.getOutRecordList()); map.put("outRecordList", couponInfo.getOutRecordList());
map.put("couponInfo", couponInfo.getProductCouponMap().values().addAll(couponInfo.getFullReductionCouponMap().values())); ArrayList<Object> list = new ArrayList<>();
list.addAll(couponInfo.getProductCouponMap().values());
list.addAll(couponInfo.getFullReductionCouponMap().values());
map.put("couponInfo", list);
orderInfo.setCouponInfoList(JSONObject.toJSONString(map)); orderInfo.setCouponInfoList(JSONObject.toJSONString(map));
} }