From 21b9f3bf3502d9f49d096fbdd7a580251acdfea2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 29 Sep 2025 10:48:17 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=20orderSplitRecords=E4=B8=AD=E7=94=B5?= =?UTF-8?q?=E8=B4=B9=E5=88=86=E8=B4=A6=E9=87=91=E9=A2=9D=E4=B8=8E=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E8=B4=B9=E5=88=86=E8=B4=A6=E9=87=91=E9=A2=9D=E4=B8=BA?= =?UTF-8?q?null,=20=E8=AE=BE=E7=BD=AE0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderSplitRecordServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 a6863443e..936fb5b82 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 @@ -158,7 +158,17 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { return Lists.newArrayList(); } // 根据入参拉出时间段内所有订单的分账记录 - return orderSplitRecordMapper.queryOrderSplitDataList(merchantId, stationId, startTime, endTime); + List orderSplitRecords = orderSplitRecordMapper.queryOrderSplitDataList(merchantId, stationId, startTime, endTime); + // orderSplitRecords中电费分账金额与服务费分账金额为null, 设置0 + for (OrderSplitRecord orderSplitRecord : orderSplitRecords) { + if (orderSplitRecord.getElectricitySplitAmount() == null) { + orderSplitRecord.setElectricitySplitAmount(BigDecimal.ZERO); + } + if (orderSplitRecord.getServiceSplitAmount() == null) { + orderSplitRecord.setServiceSplitAmount(BigDecimal.ZERO); + } + } + return orderSplitRecords; } /**