From e55866f7aca4004bbc6b0f83400a80a0d881922c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 7 Jan 2025 15:28:19 +0800
Subject: [PATCH] =?UTF-8?q?1.cashOut=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqx/modules/job/task/TempCashOutTask.java | 37 +++++++++++++------
 .../com/sqx/modules/pay/dao/CashOutDao.java   |  3 +-
 src/main/resources/mapper/pay/CashDao.xml     |  2 +-
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/sqx/modules/job/task/TempCashOutTask.java b/src/main/java/com/sqx/modules/job/task/TempCashOutTask.java
index 4511bd70..4b803b26 100644
--- a/src/main/java/com/sqx/modules/job/task/TempCashOutTask.java
+++ b/src/main/java/com/sqx/modules/job/task/TempCashOutTask.java
@@ -2,12 +2,14 @@ package com.sqx.modules.job.task;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sqx.modules.pay.dao.CashOutDao;
 import com.sqx.modules.pay.entity.CashOut;
 import com.sqx.modules.pay.wuyou.BaseResp;
 import com.sqx.modules.pay.wuyou.WuyouPay;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -23,19 +25,32 @@ public class TempCashOutTask{
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
-    public void run(String params) {
+    @Scheduled(cron = "0 0/8 * * * ? ")
+    public void run() {
         logger.info("提现开始");
-        List<CashOut> cashOuts = cashOutDao.selectTemp();
+        List<CashOut> cashOuts = cashOutDao.selectTemp(DateUtil.offsetMinute(DateUtil.date(), 5));
         for (CashOut cashOut : cashOuts) {
-            BaseResp baseResp = wuyouPay.queryExtractOrder(cashOut.getOrderNumber(), cashOut.getUserId(), cashOut.getUserType() != 2, cashOut.getMoney());
-            logger.info("baseResp：{} ", JSONUtil.toJsonStr(baseResp));
-            if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))){
-                logger.info("success：{} ", cashOut.getOrderNumber());
-                cashOut.setState(1);
-                cashOut.setOutAt(DateUtil.now());
-                cashOut.setRefund(null);
-                cashOut.setOutAt(DateUtil.now());
-                cashOutDao.updateById(cashOut);
+            try {
+                BaseResp baseResp;
+                if (DateUtil.parse(cashOut.getCreateAt()).compareTo(DateUtil.parse("2025-01-06 16:50:00")) < 0) {
+                    baseResp = wuyouPay.queryExtractOrder(cashOut.getOrderNumber(), cashOut.getUserId(), cashOut.getUserType() != 2, cashOut.getMoney());
+                }else {
+                    baseResp = wuyouPay.queryExtractOrder(cashOut.getOrderNumber(), cashOut.getMoney());
+                }
+                logger.info("baseResp：{} ", JSONUtil.toJsonStr(baseResp));
+                if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))){
+                    logger.info("success：{} ", cashOut.getOrderNumber());
+                    cashOut.setState(1);
+                    cashOut.setOutAt(DateUtil.now());
+                    cashOut.setRefund(null);
+                    cashOut.setOutAt(DateUtil.now());
+                    cashOutDao.update(cashOut, new LambdaQueryWrapper<CashOut>().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId()));
+                }else if (baseResp.getStatus() != null && baseResp.getStatus().equals(3)) {
+                    cashOut.setState(2);
+                    cashOutDao.update(cashOut, new LambdaQueryWrapper<CashOut>().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId()));
+                }
+            }catch (Exception e) {
+                logger.error("体现定时任务查询出错", e);
             }
         }
         logger.info("提现结束");
diff --git a/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java b/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java
index db7df678..eda0fdbd 100644
--- a/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java
+++ b/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java
@@ -1,5 +1,6 @@
 package com.sqx.modules.pay.dao;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sqx.modules.pay.entity.CashOut;
 import org.apache.ibatis.annotations.Mapper;
@@ -22,7 +23,7 @@ public interface CashOutDao extends BaseMapper<CashOut> {
 
     List<CashOut> selectYesterday();
 
-    List<CashOut> selectTemp();
+    List<CashOut> selectTemp(@Param("time")DateTime time);
 
     Double selectCashOutSum(@Param("userId") Long userId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
diff --git a/src/main/resources/mapper/pay/CashDao.xml b/src/main/resources/mapper/pay/CashDao.xml
index 81fbb266..f9cb2667 100644
--- a/src/main/resources/mapper/pay/CashDao.xml
+++ b/src/main/resources/mapper/pay/CashDao.xml
@@ -18,7 +18,7 @@
     <select id="selectTemp" resultType="com.sqx.modules.pay.entity.CashOut">
         SELECT * FROM cash_out
         WHERE
-            state = 0 and order_number is not null and order_number != ''
+            (state = 0 or state=4) and order_number is not null and order_number != '' and create_at &lt; #{time}
     </select>
 
     <select id="selectCashOutSum" resultType="Double">