From b7dbbfd22cfe544c0b665d6c1ccaa1883602b433 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 28 May 2026 15:32:52 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2sql=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/PaymentTestController.java  |  2 +-
 .../mapper/pile/AdapayUnsplitRecordMapper.xml |  1 +
 .../AdapayUnsplitRecordHandleServiceImpl.java | 22 +++----------------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java
index fcb20198d..63917a727 100644
--- a/jsowell-admin/src/test/java/PaymentTestController.java
+++ b/jsowell-admin/src/test/java/PaymentTestController.java
@@ -176,7 +176,7 @@ public class PaymentTestController {
      */
     @Test
     public void refreshAdapayUnsplitRecordHandleFlagTestV2() {
-        String paymentId = "002212025100511252110820751665557659648";
+        String paymentId = "002212026021922271410870565370037276672";
         adapayUnsplitRecordHandleService.syncAndRefreshFlagsFromAdapay(paymentId, wechatAppId1);
     }
 
diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayUnsplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayUnsplitRecordMapper.xml
index 2bc336656..c5583e965 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/AdapayUnsplitRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/AdapayUnsplitRecordMapper.xml
@@ -759,5 +759,6 @@
 <!--      (refund_flag IS NULL OR refund_flag != 'SUCCESS')-->
 <!--       OR (split_flag IS NULL OR split_flag != 'SUCCESS')-->
     refund_flag IS NULL OR split_flag IS NULL
+    order by pay_time
   </select>
 </mapper>
diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/service/impl/AdapayUnsplitRecordHandleServiceImpl.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/service/impl/AdapayUnsplitRecordHandleServiceImpl.java
index aa0540c45..948a5cf8c 100644
--- a/jsowell-quartz/src/main/java/com/jsowell/quartz/service/impl/AdapayUnsplitRecordHandleServiceImpl.java
+++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/service/impl/AdapayUnsplitRecordHandleServiceImpl.java
@@ -12,7 +12,6 @@ import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse;
 import com.jsowell.adapay.service.AdapayService;
 import com.jsowell.common.YouDianUtils;
 import com.jsowell.common.constant.Constants;
-import com.jsowell.common.enums.adapay.AdapayStatusEnum;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.StringUtils;
@@ -22,17 +21,9 @@ import com.jsowell.pile.dto.ApplyRefundDTO;
 import com.jsowell.pile.service.AdapayUnsplitRecordService;
 import com.jsowell.pile.service.OrderBasicInfoService;
 import com.jsowell.pile.vo.AdapayUnsplitRecordVO;
-import com.jsowell.pile.vo.web.OrderDetailInfoVO;
 import com.jsowell.quartz.service.AdapayUnsplitRecordHandleService;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DataFormatter;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.usermodel.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,21 +34,14 @@ import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 public class AdapayUnsplitRecordHandleServiceImpl implements AdapayUnsplitRecordHandleService {
 
     private static final int IMPORT_BATCH_SIZE = 500;
-    private static final int REFUND_WAIT_MAX_ATTEMPTS = 12;
+    private static final int REFUND_WAIT_MAX_ATTEMPTS = 2;
     private static final long REFUND_WAIT_INTERVAL_MILLIS = 5000L;
     private static final String HANDLE_FLAG_SUCCESS = "SUCCESS";
     private static final String HANDLE_FLAG_PROCESSING = "PROCESSING";