From 75620c356ea653e657f7934dcaaab159a27c88fd Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Thu, 29 Jan 2026 10:39:39 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../m2pool/lease/task/OrderAndPayTask.java    | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java b/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java
index f0d266a..83ea0d2 100644
--- a/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java
+++ b/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java
@@ -831,6 +831,7 @@ public class OrderAndPayTask {
                 }
             }
 
+            BigDecimal fee = totalRealAmount.multiply(leaseShop.getFeeRate());
             LeasePayRecordMessage build = LeasePayRecordMessage.builder()
                     .queueId(orderInfo.getOrderNumber())
                     .fromAddress(firstItem.getFromAddress())
@@ -851,8 +852,9 @@ public class OrderAndPayTask {
                     .sellerId(leaseShop.getAuthId())
                     .status(1)
                     .sellerEmail(leaseShop.getUserEmail())
-                    .receivedAmount(totalRealAmount.subtract(totalRealAmount.multiply(leaseShop.getFeeRate())))
+                    .receivedAmount(totalRealAmount.subtract(fee))
                     .feeRate(leaseShop.getFeeRate())
+                    .feeRate(fee)
                     .build();
 
             reocrdList.add(build);
@@ -1084,6 +1086,23 @@ public class OrderAndPayTask {
     }
 
 
+    /**
+     * 提现十分钟超时机制
+     */
+    @Async("scheduledTaskExecutor")
+    @Scheduled(cron = "0 0/1 * * * ? ")
+    @Transactional
+    public void withdrawTimeout(){
+        List<LeasePayWithdrawMessage> leasePayWithdrawMessages = leasePayWithdrawMessageMapper.selectList(new LambdaQueryWrapper<LeasePayWithdrawMessage>()
+                .eq(LeasePayWithdrawMessage::getStatus, 2)
+                .le(LeasePayWithdrawMessage::getCreateTime, LocalDateTime.now().minusMinutes(10)));
+        if (!leasePayWithdrawMessages.isEmpty()){
+            for (LeasePayWithdrawMessage leasePayWithdrawMessage : leasePayWithdrawMessages) {
+                leasePayWithdrawMessage.setStatus(0);
+                leasePayWithdrawMessageMapper.updateById(leasePayWithdrawMessage);
+            }
+        }
+    }
 
     ///**
     // * 订单完成后---发送支付消息到mq 一个买家对应多个卖家