Changes

CatmDogd-Mall-Front-test/.env.production

@@ -5,6 +5,6 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/api'
-# VUE_APP_BASE_API = '/prod-api'
+# VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = '/prod-api'
 VUE_APP_JUDGE_STAR = 08

CatmDogd-Mall-Front-test/src/views/model/AppletAmountLog/audit.vue

@@ -326,7 +326,7 @@ export default {
       listAppletAmountLog(params).then(response => {
         // 过滤出需要审核的提现记录（有auditStatus字段且nameValue不为空的记录）
         this.AppletAmountLogList = response.rows
-        this.total = response.length;
+        this.total = response.total;
         this.loading = false;
       });
     },

ruoyi-admin/src/main/resources/application-druid-root.yml

@@ -6,8 +6,8 @@ spring:
         druid:
             # 主库数据源 jdbc:mysql://localhost:3306/catmdogf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
             master:
-                url: jdbc:mysql://47.97.158.59:3306/catmdogf_test20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
-#                url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+#                url: jdbc:mysql://47.97.158.59:3306/catmdogf_test20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+                url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
                 username: root
                 password: Qweruiop@123
             # 从库数据源

ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/AppletAmountService.java

@@ -384,15 +384,15 @@ public class AppletAmountService {
 
     /**
      * 批量处理超时提现申请
-     * 处理审核通过后超过48小时未领取的提现申请，自动退回到用户账户
+     * 处理审核通过后超过24小时未领取的提现申请，自动退回到用户账户
      * @return 处理的记录数量
      */
     @Transactional
     public int processTimeoutWithdrawals() {
         try {
-            // 查询审核通过后超过48小时未领取的提现记录
-            // 条件：审核状态为通过(1)，处理状态为处理中(0)，审核时间超过48小时
-            LocalDateTime timeoutThreshold = LocalDateTime.now().minusHours(47).minusMinutes(54);
+            // 查询审核通过后超过24小时未领取的提现记录
+            // 条件：审核状态为通过(1)，处理状态为处理中(0)，审核时间超过24小时
+            LocalDateTime timeoutThreshold = LocalDateTime.now().minusHours(23).minusMinutes(54);
             
             List<AppletAmountLog> timeoutLogs = appletAmountLogService.lambdaQuery()
                     .eq(AppletAmountLog::getAuditStatus, 1) // 审核通过
@@ -473,7 +473,7 @@ public class AppletAmountService {
 
             // 4. 更新提现记录状态为超时退回
             timeoutLog.setState(2); // 2-失败/退回
-            timeoutLog.setRemark("审核通过后超过48小时未领取，系统自动退回");
+            timeoutLog.setRemark("审核通过后超过24小时未领取，系统自动退回");
             timeoutLog.setErrorInfo("审核通过后超时未领取，系统自动退回到用户账户");
             appletAmountLogService.updateById(timeoutLog);