From e9d9fe419fdd05fb75f1b4af32af4b99a84f3922 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 13 Mar 2025 13:43:30 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8F=90=E7=8E=B0=E8=BF=90=E8=90=A5=E5=95=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/mapper/PileMerchantInfoMapper.java | 13 +++++++++----
 .../pile/service/PileMerchantInfoService.java       |  6 ++++++
 .../service/impl/PileMerchantInfoServiceImpl.java   |  6 ++++++
 .../mapper/pile/PileMerchantInfoMapper.xml          |  9 +++++++++
 .../java/com/jsowell/quartz/task/JsowellTask.java   |  3 ++-
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java
index 167af1fa0..ab48a4e98 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java
@@ -1,14 +1,13 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.PileMerchantInfo;
-
-import java.util.List;
-
 import com.jsowell.pile.dto.QueryMerchantInfoDTO;
 import com.jsowell.pile.vo.web.MerchantSettleInfoVO;
 import com.jsowell.pile.vo.web.PileMerchantInfoVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface PileMerchantInfoMapper {
     int deleteByPrimaryKey(Integer id);
 
@@ -162,4 +161,10 @@ public interface PileMerchantInfoMapper {
      * @return
      */
     PileMerchantInfoVO queryMerchantInfoByStationId(String stationId);
-}
\ No newline at end of file
+
+    /**
+     * 查询自动提现的运营商信息
+     * @return
+     */
+    List<PileMerchantInfo> selectAutoWithdrawalMerchantInfoList();
+}
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java
index 6629150f8..d5fffdba7 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java
@@ -192,4 +192,10 @@ public interface PileMerchantInfoService {
 	MerchantWithdrawalTypeVO queryWithdrawalType(QueryMerchantInfoDTO dto);
 
 	int updateWithdrawalType(MerchantWithdrawalTypeVO dto);
+
+	/**
+	 * 查询设置自动提现的运营商列表
+	 * @return
+	 */
+    List<PileMerchantInfo> selectAutoWithdrawalMerchantInfoList();
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
index 5685300b0..f0953b055 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
@@ -670,4 +670,10 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
 		return pileMerchantInfoMapper.updateByPrimaryKeySelective(merchantInfo);
 	}
 
+	@Override
+	public List<PileMerchantInfo> selectAutoWithdrawalMerchantInfoList() {
+		List<PileMerchantInfo> list = pileMerchantInfoMapper.selectAutoWithdrawalMerchantInfoList();
+		return list;
+	}
+
 }
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
index 9f707a76a..f5616b831 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml
@@ -1246,4 +1246,13 @@
           AND t1.id = #{stationId,jdbcType=VARCHAR}
     </select>
 
+  <select id="selectAutoWithdrawalMerchantInfoList" resultMap="BaseResultMap">
+    select
+      <include refid="Base_Column_List" />
+    from
+      pile_merchant_info
+    where del_flag = '0'
+        and status = '1'
+      and withdrawal_type = '2'
+  </select>
 </mapper>
diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java
index 8597b11c0..c51b97e42 100644
--- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java
+++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java
@@ -255,7 +255,8 @@ public class JsowellTask {
      */
     public void automaticPayouts() {
         // TODO 查询开启自动提现运营商列表
-        List<PileMerchantInfo> pileMerchantInfos = pileMerchantInfoService.selectPileMerchantInfoList(null);
+        // List<PileMerchantInfo> pileMerchantInfos = pileMerchantInfoService.selectPileMerchantInfoList(null);
+        List<PileMerchantInfo> pileMerchantInfos = pileMerchantInfoService.selectAutoWithdrawalMerchantInfoList();
         if (CollectionUtils.isEmpty(pileMerchantInfos)) {
             log.info("定时任务，自动提现, 未查询到运营商列表，直接返回");
             return;