autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-22 03:55:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
YAS\29473
2025-09-29 13:13:29 +08:00
parent a5d8764434 21b9f3bf35
commit a1652067c0
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
View File

@@ -158,7 +158,17 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
return Lists.newArrayList();
}
// 根据入参拉出时间段内所有订单的分账记录
return orderSplitRecordMapper.queryOrderSplitDataList(merchantId, stationId, startTime, endTime);
List<OrderSplitRecord> 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;
}
/**