From 0658e679307cff71f21c14e1f8592f73b6823b1b Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 2 Apr 2025 10:23:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 2 +- .../pile/service/programlogic/DelayMerchantProgramLogic.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index c5ffa0ff6..d4877e2fa 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1991,7 +1991,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { BigDecimal orderSettleAmount = afterSettleOrderDTO.getOrderSettleAmount() == null ? BigDecimal.ZERO : afterSettleOrderDTO.getOrderSettleAmount(); // 订单是否需要分账, 结算金额必须大于0 if (orderSettleAmount.compareTo(BigDecimal.ZERO) <= 0) { - logger.info("realTimeOrderSplit-订单[{}]结算金额必须大于0", afterSettleOrderDTO.getOrderCode()); + logger.info("realTimeOrderSplit-订单[{}]结算金额[{}]必须大于0", afterSettleOrderDTO.getOrderCode(), orderSettleAmount); return null; } // 校验分账 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 70d465261..553ab89c5 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 @@ -769,6 +769,11 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { @Override public void refundOrder(OrderBasicInfo orderBasicInfo) { BigDecimal refundAmount = orderBasicInfo.getRefundAmount(); + // 如果退款金额小于0, 不执行退款 + if (refundAmount.compareTo(BigDecimal.ZERO) < 0) { + logger.info("执行订单退款-退款金额小于0，orderCode:{}, 退款金额:{}", orderBasicInfo.getOrderCode(), refundAmount); + return; + } // 查询该笔订单的退款记录 List orderRefundInfoList = orderBasicInfoService.getOrderRefundInfoList(orderBasicInfo); if (CollectionUtils.isNotEmpty(orderRefundInfoList)) {