|
|
@@ -846,14 +846,14 @@ DISCOUNT("畅学卡")
|
|
|
|
|
|
// 根据商品金额比例分摊优惠金额
|
|
|
// 剩余金额
|
|
|
- BigDecimal remainAmount = BigDecimal.ZERO;
|
|
|
+ BigDecimal remainAmount = BigDecimal.valueOf(couponInfo.getDiscountPrice());
|
|
|
for (Map.Entry<Integer, BigDecimal> entry : couponAmountMap.entrySet()) {
|
|
|
UserPaymentOrderWrapper.OrderGoodsInfo goodsInfo = goodsInfos.get(entry.getKey());
|
|
|
UserOrderDetail userOrderDetail = goodsInfo.getUserOrderDetail();
|
|
|
BigDecimal actualPrice = entry.getValue();
|
|
|
BigDecimal couponAmount = BigDecimal.valueOf(couponInfo.getDiscountPrice())
|
|
|
.multiply(userOrderDetail.getActualPrice()).divide(amount, 2, RoundingMode.HALF_DOWN);
|
|
|
- remainAmount = BigDecimal.valueOf(couponInfo.getDiscountPrice()).subtract(couponAmount);
|
|
|
+ remainAmount = remainAmount.subtract(couponAmount);
|
|
|
userOrderDetail.setCouponAmount(couponAmount.add(userOrderDetail.getCouponAmount()));
|
|
|
|
|
|
userOrderDetail.setDiscountJson(userOrderService.discountJson(EDiscountType.COUPON,
|
