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

Merge branch 'master' into dev-zza

Browse Source
This commit is contained in:
Lemon
2025-10-11 10:11:08 +08:00
parent e6865a4f92 2e7d7cebbc
commit 2099fe688e
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,9 @@ public class SplitBillService {
*/ */
public void retryMerchantSplit(QueryOrderSplitRecordDTO dto) throws BaseAdaPayException { public void retryMerchantSplit(QueryOrderSplitRecordDTO dto) throws BaseAdaPayException {
// 首先根据 merchantId、startTime、endTime 查出日期区间内所有订单信息（包括 paymentId） // 首先根据 merchantId、startTime、endTime 查出日期区间内所有订单信息（包括 paymentId）
// 格式化 startTime 和 endTime
dto.setStartTime(dto.getStartTime() + " 00:00:00");
dto.setEndTime(dto.getEndTime() + " 23:59:59");
List<OrderPaymentDetailVO> recordList = orderBasicInfoService.getSplitOrders(dto); List<OrderPaymentDetailVO> recordList = orderBasicInfoService.getSplitOrders(dto);
if (CollectionUtils.isEmpty(recordList)) { if (CollectionUtils.isEmpty(recordList)) {
log.info("重试运营商分账-根据参数未查询到符合条件的订单, param:{}", dto); log.info("重试运营商分账-根据参数未查询到符合条件的订单, param:{}", dto);

20
jsowell-admin/src/test/resources/payment_ids
View File

@@ -1,15 +1,5 @@
002212025061217110110779164047563894784 002212025100216092510819735989514358784
002212025061322340710779607747741483008 002212025100216494510819746140195753984
002212025061418550310779915007347294208 002212025100211594410819673151119028224
002212025061819323910781374018623815680 002212025100213081910819690412575670272
002212025061914575410781667265052803072 002212025100213554410819702347450773504
002212025061915014710781668242201739264
002212025061915205310781673049609957376
002212025061915243210781673968498507776
002212025061915284710781675036102795264
002212025061915322810781675963882827776
002212025061915400610781677883724562432
002212025061915444310781679048033271808
002212025061915571210781682186405658624
002212025061916004310781683071181504512
002212025061916161110781686963112738816