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; } /**