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 6bb99eb..3c79e7a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1217,6 +1217,7 @@ public class CartService { tbActivateOutRecord.setRefNum(0); outRecords.add(tbActivateOutRecord); cashierCart.setUseCouponInfo(JSONObject.toJSONString(tbActivateOutRecord)); + couponVo.setFinalDiscountAmount(discountAmount); // 优惠券未消耗完毕 if (balanceCart != null && getCanUseCoupon(couponMap, balanceCart.getProductId()) != null) { @@ -1231,7 +1232,6 @@ public class CartService { memberId )); } - couponVo.setFinalDiscountAmount(discountAmount); return discountAmount; } return discountAmount; @@ -1270,7 +1270,7 @@ public class CartService { cashierCart.setUserCouponId(null); } 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()) {