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 查询sql添加根据时间排序

Browse Source
This commit is contained in:
Guoqs
2026-05-28 15:32:52 +08:00
parent 672fb3787b
commit b7dbbfd22c
3 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/test/java/PaymentTestController.java
View File

@@ -176,7 +176,7 @@ public class PaymentTestController {
*/ */
@Test @Test
public void refreshAdapayUnsplitRecordHandleFlagTestV2() { public void refreshAdapayUnsplitRecordHandleFlagTestV2() {
String paymentId = "002212025100511252110820751665557659648"; String paymentId = "002212026021922271410870565370037276672";
adapayUnsplitRecordHandleService.syncAndRefreshFlagsFromAdapay(paymentId, wechatAppId1); adapayUnsplitRecordHandleService.syncAndRefreshFlagsFromAdapay(paymentId, wechatAppId1);
} }

1
jsowell-pile/src/main/resources/mapper/pile/AdapayUnsplitRecordMapper.xml
View File

@@ -759,5 +759,6 @@
<!-- (refund_flag IS NULL OR refund_flag != 'SUCCESS')--> <!-- (refund_flag IS NULL OR refund_flag != 'SUCCESS')-->
<!-- OR (split_flag IS NULL OR split_flag != 'SUCCESS')--> <!-- OR (split_flag IS NULL OR split_flag != 'SUCCESS')-->
refund_flag IS NULL OR split_flag IS NULL refund_flag IS NULL OR split_flag IS NULL
order by pay_time
</select> </select>
</mapper> </mapper>

22
jsowell-quartz/src/main/java/com/jsowell/quartz/service/impl/AdapayUnsplitRecordHandleServiceImpl.java
View File

@@ -12,7 +12,6 @@ import com.jsowell.adapay.response.QueryPaymentConfirmDetailResponse;
import com.jsowell.adapay.service.AdapayService; import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.YouDianUtils; import com.jsowell.common.YouDianUtils;
import com.jsowell.common.constant.Constants; import com.jsowell.common.constant.Constants;
import com.jsowell.common.enums.adapay.AdapayStatusEnum;
import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.PageUtils;
import com.jsowell.common.util.StringUtils; 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.AdapayUnsplitRecordService;
import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.vo.AdapayUnsplitRecordVO; import com.jsowell.pile.vo.AdapayUnsplitRecordVO;
import com.jsowell.pile.vo.web.OrderDetailInfoVO;
import com.jsowell.quartz.service.AdapayUnsplitRecordHandleService; import com.jsowell.quartz.service.AdapayUnsplitRecordHandleService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.*;
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.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -43,21 +34,14 @@ import java.math.BigDecimal;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.*;
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.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
public class AdapayUnsplitRecordHandleServiceImpl implements AdapayUnsplitRecordHandleService { public class AdapayUnsplitRecordHandleServiceImpl implements AdapayUnsplitRecordHandleService {
private static final int IMPORT_BATCH_SIZE = 500; 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 long REFUND_WAIT_INTERVAL_MILLIS = 5000L;
private static final String HANDLE_FLAG_SUCCESS = "SUCCESS"; private static final String HANDLE_FLAG_SUCCESS = "SUCCESS";
private static final String HANDLE_FLAG_PROCESSING = "PROCESSING"; private static final String HANDLE_FLAG_PROCESSING = "PROCESSING";