From 15498bc421ee9dc7cd18d2533f3f2cd922379939 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 3 Feb 2024 14:45:24 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E6=83=A0=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E9=BB=98=E8=AE=A40?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/programlogic/DelayMerchantProgramLogic.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index 69acdb763..71234829e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -617,8 +617,10 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { giftPay = giftPayRecordList.stream().map(OrderPayRecord::getPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add); } + BigDecimal discountAmount = orderBasicInfo.getDiscountAmount() == null ? BigDecimal.ZERO : orderBasicInfo.getDiscountAmount(); + // 计算需要退回的金额 - Map returnAmountMap = calculateReturnAmount(principalPay, giftPay, orderAmount, orderBasicInfo.getDiscountAmount()); + Map returnAmountMap = calculateReturnAmount(principalPay, giftPay, orderAmount, discountAmount); logger.info("结算订单:{}, 剩余金额退回余额, 订单消费金额:{}, 本金支付金额:{}, 赠送支付金额:{}, 退回金额map:{}", orderCode, orderAmount, principalPay, null, JSONObject.toJSONString(returnAmountMap));