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 c35cce4..ecfdf07 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1189,7 +1189,7 @@ public class CartService { tbActivateOutRecord.setRefNum(0); outRecords.add(tbActivateOutRecord); - couponVo.setCurrentDiscountAmount(couponVo.getCurrentDiscountAmount().add(couponVo.getCurrentDiscountAmount())); + couponVo.setCurrentDiscountAmount(couponVo.getCurrentDiscountAmount().add(discountAmount)); // 优惠券未消耗完毕 if (balanceCart != null && getCanUseCoupon(couponMap, balanceCart.getProductId()) != null) { discountAmount = reduceProCoupon(couponMap, balanceCart, usedCouponMap, discountAmount, balanceCartList, outRecords, memberId); @@ -1404,7 +1404,10 @@ public class CartService { couponInfo.setProductCouponMap(BeanUtil.copyProperties(couponInfo.getProductCouponMap(), HashMap.class)); HashMap map = new HashMap<>(); map.put("outRecordList", couponInfo.getOutRecordList()); - map.put("couponInfo", couponInfo.getProductCouponMap().values().addAll(couponInfo.getFullReductionCouponMap().values())); + ArrayList list = new ArrayList<>(); + list.addAll(couponInfo.getProductCouponMap().values()); + list.addAll(couponInfo.getFullReductionCouponMap().values()); + map.put("couponInfo", list); orderInfo.setCouponInfoList(JSONObject.toJSONString(map)); }