From 28f113a6c94d91973ee29e7741690ef84c50d9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sat, 7 Feb 2026 16:37:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(withdraw):=20=E6=B7=BB=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=A0=B8=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为租户ID 10584添加提现自动审核功能，金额小于等于50元自动通过
- 设置提现金额大于50小于1000需人工审核
- 调整订单过期时间从10分钟延长至60分钟
---
 .../controller/ShopDealerWithdrawController.java  | 15 +++++++++++++++
 .../shop/controller/ShopOrderController.java      |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java
index 081c7e6..42bc162 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java
@@ -101,6 +101,21 @@ public class ShopDealerWithdrawController extends BaseController {
             shopDealerWithdraw.setApplyStatus(10);
             shopDealerWithdraw.setAuditTime(null);
 
+            if(shopDealerWithdraw.getTenantId().equals(10584)){
+              // 1.如果体现金额小于等于50，则可以自动审核通过
+              if (shopDealerWithdraw.getMoney().compareTo(java.math.BigDecimal.valueOf(50)) <= 0) {
+                shopDealerWithdraw.setApplyStatus(20);
+                shopDealerWithdraw.setAuditTime(LocalDateTime.now());
+              }
+              // 2.如果提现金额大于50，小于1000，则需要人工审核
+              shopDealerWithdraw.setApplyStatus(10);
+              shopDealerWithdraw.setAuditTime(null);
+              // 3.如果金额大于1000，小于10000，则除了财务审核还需要农总审核
+
+              // 4.如果金额大于10000，则需要财务、农总、明、钟四个人审核
+
+            }
+
             final ShopDealerUser dealerUser = shopDealerUserService.getByUserIdRel(loginUser.getUserId());
             if (dealerUser == null) {
                 return fail("分销商信息不存在");
diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java
index 0a1ebfc..de69242 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java
@@ -157,7 +157,7 @@ public class ShopOrderController extends BaseController {
             if (shopOrder.getUpdateTime() == null) {
                 shopOrder.setUpdateTime(now);
             }
-            shopOrder.setExpirationTime(shopOrder.getCreateTime().plusMinutes(10));
+            shopOrder.setExpirationTime(shopOrder.getCreateTime().plusMinutes(60));
 
             if (shopOrder.getOrderNo() == null) {
                 shopOrder.setOrderNo(Long.toString(IdUtil.getSnowflakeNextId()));