From 42f828a812ea676c5582b8f9db6fd9ead326ff80 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 16 Apr 2025 14:39:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95=E5=BE=85?= =?UTF-8?q?=E5=88=86=E8=B4=A6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 8 +++++++- 1 file changed, 7 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 c4dec91d1..3dedfb9f6 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 @@ -1966,6 +1966,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // 选出需要分账的支付id List paymentInfos = Lists.newArrayList(); for (OrderPayRecord orderPayRecord : orderPayRecordList) { + String paymentId = orderPayRecord.getPaymentId(); // 汇付支付id + // TODO 根据paymentId查询支付金额, 退款金额, 未分账金额 BigDecimal payAmount = orderPayRecord.getPayAmount(); BigDecimal refundAmount = orderPayRecord.getRefundAmount() == null ? BigDecimal.ZERO : orderPayRecord.getRefundAmount(); // 如果相减等于0，说明这笔支付单退完了，就不用分账了 @@ -1973,7 +1975,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { if (subtract.compareTo(BigDecimal.ZERO) > 0) { paymentInfos.addAll(orderPayRecordService.parseDeductionRecord(orderPayRecord.getDeductionRecord())); } else { - logger.info("realTimeOrderSplit-订单:{}, 支付记录:{}, 支付金额({})与退款金额({})相等，不需要分账", orderCode, orderPayRecord.getPaymentId(), payAmount, refundAmount); + logger.info("realTimeOrderSplit-订单:{}, 支付记录:{}, 支付金额({})与退款金额({})相等，不需要分账", orderCode, paymentId, payAmount, refundAmount); } } logger.info("根据订单号:{}, 查询出{}笔支付信息, 需要分账的支付信息为:{}", orderCode, paymentInfos.size(), JSON.toJSONString(paymentInfos)); @@ -2003,6 +2005,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // 获取订单待分账信息 List paymentInfos = getOrderPaymentInfoList(afterSettleOrderDTO); + if (CollectionUtils.isEmpty(paymentInfos)) { + logger.info("realTimeOrderSplit-订单[{}]没有待分账的支付记录", afterSettleOrderDTO.getOrderCode()); + return null; + } // 根据站点id查询分账配置(如果未配置则初始化) List stationSplitConfigList = stationSplitConfigService.queryByStationIdWithInit(stationId);