autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-12 19:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 修复NPM异常

Browse Source
This commit is contained in:
Guoqs
2025-08-04 15:08:14 +08:00
parent 268cb88c47
commit e642a7f5fe
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,6 +210,20 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
BigDecimal totalMerchantServiceAmount = BigDecimal.ZERO; // 当天运营商分账金额汇总 BigDecimal totalMerchantServiceAmount = BigDecimal.ZERO; // 当天运营商分账金额汇总
BigDecimal totalOtherSplitAmount = BigDecimal.ZERO; // 当天其他人分账金额汇总 BigDecimal totalOtherSplitAmount = BigDecimal.ZERO; // 当天其他人分账金额汇总
BigDecimal totalFeeAmount = BigDecimal.ZERO; // 当天手续费金额 BigDecimal totalFeeAmount = BigDecimal.ZERO; // 当天手续费金额
// 如果没有查询到订单分账记录, 进入下一个循环
if (CollectionUtils.isNotEmpty(orderCodeSet)) {
summaryData.setOtherSplitDetailList(Lists.newArrayList());
summaryData.setTotalSettleAmount(totalSettleAmount);
summaryData.setMerchantSplitAmount(totalMerchantSplitAmount);
summaryData.setMerchantFeeAmount(totalFeeAmount);
summaryData.setMerchantElecAmount(totalMerchantElecAmount);
summaryData.setMerchantServiceAmount(totalMerchantServiceAmount);
summaryData.setOtherSplitAmount(totalOtherSplitAmount);
resultList.add(summaryData);
continue;
}
Map<String, List<OrderSplitRecord>> otherSplitDetailMap = Maps.newHashMap(); // 当天其他人分账的记录 Map<String, List<OrderSplitRecord>> otherSplitDetailMap = Maps.newHashMap(); // 当天其他人分账的记录
for (Map.Entry<String, List<OrderSplitRecord>> listEntry : adapayMemberIdRecordMap.entrySet()) { for (Map.Entry<String, List<OrderSplitRecord>> listEntry : adapayMemberIdRecordMap.entrySet()) {
List<OrderSplitRecord> recordList = listEntry.getValue(); List<OrderSplitRecord> recordList = listEntry.getValue();