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 74a117827..2187e7bfe 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 @@ -683,7 +683,12 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { List orderSplitRecords = orderSplitRecordService.queryOrderSplitRecordList(stationInfo.getMerchantId(), stationId, tradeDate, tradeDate); log.info("查分账记录,站点:{}, 在{}-{}查询到分账数据{}条", stationInfo.getStationName(), startTime, endTime, orderSplitRecords.size()); // orderSplitRecords转为map, key为订单编号, value为分账记录 - Map splitRecordMap = orderSplitRecords.stream().collect(Collectors.toMap(OrderSplitRecord::getOrderCode, v -> v)); + // Map splitRecordMap = orderSplitRecords.stream().collect(Collectors.toMap(OrderSplitRecord::getOrderCode, v -> v)); + + // orderSplitRecords转为map, key为订单编号, value为分账记录(过滤该运营商分账记录) + Map splitRecordMap = orderSplitRecords.stream() + .filter(v -> v.getFeeAmount().compareTo(BigDecimal.ZERO) > 0) + .collect(Collectors.toMap(OrderSplitRecord::getOrderCode, v -> v)); // 统计出日报信息 BigDecimal useElectricity = BigDecimal.ZERO; // 总电量使用量