diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java index 7bb022b04..dd92b3b70 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java @@ -212,7 +212,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { BigDecimal totalFeeAmount = BigDecimal.ZERO; // 当天手续费金额 // 如果没有查询到订单分账记录, 进入下一个循环 - if (CollectionUtils.isNotEmpty(orderCodeSet)) { + if (CollectionUtils.isEmpty(orderCodeSet)) { summaryData.setOtherSplitDetailList(Lists.newArrayList()); summaryData.setTotalSettleAmount(totalSettleAmount); summaryData.setMerchantSplitAmount(totalMerchantSplitAmount); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index 827097bce..b4a624bd8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -455,6 +455,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { // 获取他人分账金额 List orderSplitDailySummaryData = orderSplitRecordService.queryOrderSplitData(dto.getMerchantId(), null, dto.getStartTime(), dto.getEndTime()); + log.info("orderSplitDailySummaryData: {}", orderSplitDailySummaryData); if (!CollectionUtils.isEmpty(orderSplitDailySummaryData)) { report.setOtherSplitAmount(orderSplitDailySummaryData.stream().map(OrderSplitDailySummaryData::getOtherSplitAmount).reduce(BigDecimal.ZERO, BigDecimal::add)); diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml index 3871ba0f3..2c40c9a70 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingWithdrawInfoMapper.xml @@ -539,8 +539,7 @@