autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-11 09:38:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 重试运营商分账

Browse Source
This commit is contained in:
Guoqs
2025-10-11 13:06:11 +08:00
parent 40c3da5875
commit f59201129f
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jsowell-admin/src/main/java/com/jsowell/service/SplitBillService.java
View File

@@ -2,6 +2,7 @@ package com.jsowell.service;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.huifu.adapay.core.exception.BaseAdaPayException; import com.huifu.adapay.core.exception.BaseAdaPayException;
import com.jsowell.adapay.service.AdapayService; import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.constant.Constants; import com.jsowell.common.constant.Constants;
@@ -22,7 +23,7 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.Set;
@Service @Service
public class SplitBillService { public class SplitBillService {
@@ -58,17 +59,14 @@ public class SplitBillService {
return; return;
} }
// 获取 paymentIdList
// List<String> paymentIdList = recordList.stream()
// .map(OrderPaymentDetailVO::getPaymentId)
// .collect(Collectors.toList());
// 循环一次，获得paymentIdList 与 Map // 循环一次，获得paymentIdList 与 Map
List<String> paymentIdList = Lists.newArrayList(); List<String> paymentIdList = Lists.newArrayList();
Map<String, OrderPaymentDetailVO> paymentIdMap = Maps.newHashMap(); Map<String, OrderPaymentDetailVO> paymentIdMap = Maps.newHashMap();
Set<String> stationIdSet = Sets.newHashSet();
for (OrderPaymentDetailVO orderPaymentDetailVO : recordList) { for (OrderPaymentDetailVO orderPaymentDetailVO : recordList) {
paymentIdList.add(orderPaymentDetailVO.getPaymentId()); paymentIdList.add(orderPaymentDetailVO.getPaymentId());
paymentIdMap.put(orderPaymentDetailVO.getPaymentId(), orderPaymentDetailVO); paymentIdMap.put(orderPaymentDetailVO.getPaymentId(), orderPaymentDetailVO);
stationIdSet.add(orderPaymentDetailVO.getStationId());
} }
// 判断订单是否已经成功分账, 将未分账的订单进行筛选、汇总 // 判断订单是否已经成功分账, 将未分账的订单进行筛选、汇总
@@ -80,11 +78,6 @@ public class SplitBillService {
// 将 paymentIdList 与 recordList 进行匹配，筛选出 orderCodeList // 将 paymentIdList 与 recordList 进行匹配，筛选出 orderCodeList
List<String> orderCodeList = Lists.newArrayList(); List<String> orderCodeList = Lists.newArrayList();
// Set<String> paymentIdSet = new HashSet<>(unSplitPaymentIdList);
// List<String> orderCodeList = recordList.stream()
// .filter(record -> paymentIdSet.contains(record.getPaymentId()))
// .map(OrderPaymentDetailVO::getOrderCode)
// .collect(Collectors.toList());
for (String unSplitPaymentId : unSplitPaymentIdList) { for (String unSplitPaymentId : unSplitPaymentIdList) {
OrderPaymentDetailVO orderPaymentDetailVO = paymentIdMap.get(unSplitPaymentId); OrderPaymentDetailVO orderPaymentDetailVO = paymentIdMap.get(unSplitPaymentId);
if (orderPaymentDetailVO != null) { if (orderPaymentDetailVO != null) {
@@ -109,14 +102,7 @@ public class SplitBillService {
// 重新计算站点日报和运营商日报 // 重新计算站点日报和运营商日报
// 获取日期区间内所有日期 // 获取日期区间内所有日期
List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime); List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime);
// 根据 merchantId 获取所有 stationId stationIdSet.parallelStream().forEach(stationId -> {
List<PileStationInfo> pileStationInfos = pileStationInfoService.selectStationListByMerchantId(Long.parseLong(dto.getMerchantId()));
List<String> stationIdList = pileStationInfos.stream()
.map(PileStationInfo::getId)
.map(String::valueOf)
.collect(Collectors.toList());
stationIdList.parallelStream().forEach(stationId -> {
PileStationVO stationInfo = pileStationInfoService.getStationInfo(stationId); PileStationVO stationInfo = pileStationInfoService.getStationInfo(stationId);
for (String tradeDate : dateList) { for (String tradeDate : dateList) {
try { try {