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

update 重试运营商分账接口

Browse Source
This commit is contained in:
Lemon
2025-10-10 13:10:56 +08:00
parent 6a0547c596
commit 1489505e86
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,7 @@
package com.jsowell.service; package com.jsowell.service;
import com.huifu.adapay.core.exception.BaseAdaPayException;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.constant.Constants; import com.jsowell.common.constant.Constants;
import com.jsowell.pile.domain.OrderSplitRecord; import com.jsowell.pile.domain.OrderSplitRecord;
import com.jsowell.pile.dto.DebugOrderDTO; import com.jsowell.pile.dto.DebugOrderDTO;
@@ -22,20 +24,25 @@ public class SplitBillService {
@Autowired @Autowired
private TempService tempService; private TempService tempService;
@Autowired
private AdapayService adapayService;
/** /**
* 重试运营商分账 * 重试运营商分账
* @param dto * @param dto
*/ */
public void retryMerchantSplit(QueryOrderSplitRecordDTO dto) { public void retryMerchantSplit(QueryOrderSplitRecordDTO dto) throws BaseAdaPayException {
// 首先根据 merchantId、startTime、endTime 查出日期区间内所有订单信息（包括 paymentId） // 首先根据 merchantId、startTime、endTime 查出日期区间内所有订单信息（包括 paymentId）
List<OrderSplitRecord> recordList = orderBasicInfoService.getSplitOrders(dto); List<OrderSplitRecord> recordList = orderBasicInfoService.getSplitOrders(dto);
// 获取 paymentIdList
List<String> paymentIdList = recordList.stream()
.map(OrderSplitRecord::getPaymentId)
.collect(Collectors.toList());
// 判断订单是否已经成功分账 // 判断订单是否已经成功分账
// adapayService.checkOrderSplitStatus(list);
// 将未分账的订单进行筛选、汇总 // 将未分账的订单进行筛选、汇总
List<String> paymenIdList = new ArrayList<>(); List<String> unSplitPaymentIdList = adapayService.getSplitInfoByPaymentIdList(paymentIdList);
// 将 paymentIdList 与 recordList 进行匹配，筛选出 orderCodeList // 将 paymentIdList 与 recordList 进行匹配，筛选出 orderCodeList
Set<String> paymentIdSet = new HashSet<>(paymenIdList); Set<String> paymentIdSet = new HashSet<>(unSplitPaymentIdList);
List<String> orderCodeList = recordList.stream() List<String> orderCodeList = recordList.stream()
.filter(record -> paymentIdSet.contains(record.getPaymentId())) .filter(record -> paymentIdSet.contains(record.getPaymentId()))
.map(OrderSplitRecord::getOrderCode) .map(OrderSplitRecord::getOrderCode)