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 26a9b2ba6..7bb022b04 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 @@ -210,6 +210,20 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { BigDecimal totalMerchantServiceAmount = BigDecimal.ZERO; // 当天运营商分账金额汇总 BigDecimal totalOtherSplitAmount = BigDecimal.ZERO; // 当天其他人分账金额汇总 BigDecimal totalFeeAmount = BigDecimal.ZERO; // 当天手续费金额 + + // 如果没有查询到订单分账记录, 进入下一个循环 + if (CollectionUtils.isNotEmpty(orderCodeSet)) { + summaryData.setOtherSplitDetailList(Lists.newArrayList()); + summaryData.setTotalSettleAmount(totalSettleAmount); + summaryData.setMerchantSplitAmount(totalMerchantSplitAmount); + summaryData.setMerchantFeeAmount(totalFeeAmount); + summaryData.setMerchantElecAmount(totalMerchantElecAmount); + summaryData.setMerchantServiceAmount(totalMerchantServiceAmount); + summaryData.setOtherSplitAmount(totalOtherSplitAmount); + resultList.add(summaryData); + continue; + } + Map> otherSplitDetailMap = Maps.newHashMap(); // 当天其他人分账的记录 for (Map.Entry> listEntry : adapayMemberIdRecordMap.entrySet()) { List recordList = listEntry.getValue();