From a6690607189de163ffa12a3a935bf40334079157 Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Wed, 10 Dec 2025 11:12:17 +0800
Subject: [PATCH] =?UTF-8?q?12=E6=9C=8810=E6=97=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/mapper/cash/CashCollectionMapper.java   |  4 +++-
 .../com/example/demo/serviceImpl/cash/BankServiceImpl.java   |  9 +++++++--
 src/main/resources/cashMapper/CashCollectionMapper.xml       | 12 +++++++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java
index a603a36..7d04c10 100644
--- a/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java
+++ b/src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java
@@ -79,5 +79,7 @@ public interface CashCollectionMapper {
     void updateByGoldCoinOrderCodeByFirstdata(FirstdataDTO firstdataDTO);
     void updateByGoldCoinOrderCodeByIpay88(Ipay88DTO ipay88DTO);
     List<String> selectFirstdataList();
-     List<CashCollection> selectIpayList();
+    List<CashCollection> selectIpayList();
+    List<String> selectStripeList();
+    List<String> selectPaymentList();
 }
diff --git a/src/main/java/com/example/demo/serviceImpl/cash/BankServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/BankServiceImpl.java
index 867b719..ed59160 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/BankServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/BankServiceImpl.java
@@ -716,22 +716,27 @@ public class BankServiceImpl implements BankService {
     }
 
     // 银行自动处理接口(每天早上6点执行)
-    @Scheduled(cron = "1 0 6 * * ?")
+    @Scheduled(cron = "0 53 10 * * ?")
     @Override
     public Result bankAuto() {
         try {
             // 生成昨天的日期，格式为yyyyMMdd
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-            LocalDate yesterday = LocalDate.now().minusDays(1);
+            LocalDate yesterday = LocalDate.now().minusDays(7);
             String yesterdayStr = yesterday.format(formatter);
             LocalDate today = LocalDate.now();
             String todayStr = today.format(formatter);
+//            LocalDate yesterday = LocalDate.now().minusDays(2);
+//            String yesterdayStr = yesterday.format(formatter);
+//            LocalDate today = LocalDate.now().minusDays(1);
+//            String todayStr = today.format(formatter);
             // 创建BankDTO实例并设置时间
             BankDTO dto = new BankDTO();
             dto.setTime(yesterdayStr);
             dto.setStartTime(yesterdayStr);
             dto.setEndTime(todayStr);
             dto.setTime(yesterdayStr);
+            dto.setSum(1000);
 
             // 依次调用各个自动处理方法
             Result paymentResult = paymentAuto(dto);
diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml
index 153ac70..1259c0f 100644
--- a/src/main/resources/cashMapper/CashCollectionMapper.xml
+++ b/src/main/resources/cashMapper/CashCollectionMapper.xml
@@ -309,7 +309,13 @@
         select * from cash_record_collection where bank_code=#{bankCode}
     </select>
     <select id="selectFirstdataList" resultType="java.lang.String">
-        select bank_code from cash_record_collection where bank_code is not null and payload='FirstData' and order_no_status=1
+        select order_code from cash_record_collection where bank_code is not null and payload='FirstData' and order_no_status=1
+    </select>
+    <select id="selectStripeList" resultType="java.lang.String">
+        select order_code from cash_record_collection where payload='Stripe' and order_no_status=1
+    </select>
+    <select id="selectPaymentList" resultType="java.lang.String">
+        select bank_code from cash_record_collection where payload='PaymentAsia' and order_no_status=1
     </select>
      <select id="selectIpayList" resultType="com.example.demo.domain.vo.cash.CashCollection">
         select order_code,permanent_gold from cash_record_collection where payload='Ipay88' and order_no_status=1
@@ -324,6 +330,7 @@
             payment_amount=#{order_amount},
             received_amount=#{net_amount},
             handling_charge=#{charge},
+            status=4,
             order_no_status=0
         where order_code=#{merchant_reference}
     </update>
@@ -337,6 +344,7 @@
             payment_amount=#{amount},
             received_amount=#{net},
             handling_charge=#{fee},
+            status=4,
             order_no_status=0
         where order_code=#{orderNo}
     </update>
@@ -348,6 +356,7 @@
             payment_amount=#{amount},
             received_amount=#{net},
             handling_charge=#{fee},
+            status=4,
             order_no_status=0
         where order_code=#{orderId}
     </update>
@@ -359,6 +368,7 @@
             payment_amount=#{amount},
             received_amount=#{net},
             handling_charge=#{fee},
+            status=4,
             order_no_status=0
         where order_code=#{orderNo}
     </update>