From 5539ce6c40ff3ef8a2d35b44e8e5e29eaac474d5 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 9 Oct 2025 10:02:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=AF=A5=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=95=86=E5=88=86=E8=B4=A6=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/SettleOrderReportServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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; // 总电量使用量