From 400b66ecb2ab42af18ef9697c5b2a2fb831447a8 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 29 十二月 2025 12:56:56 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
index f9641ba..9750e6c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
@@ -27,6 +27,7 @@
 public class StaReserveServiceImpl extends ServiceImpl<StaReserveMapper, StaReserve> implements StaReserveService {
 
     public static final Long RESERVE_EXPIRE_TIME = 30 * 60 * 1000L;
+    public static final Long WAITING_EXPIRE_TIME = 5 * 60 * 1000L;
 
     public static final Integer DEFAULT_QTY = 1;
 
@@ -110,10 +111,13 @@
         qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
 
         // update reserve to be waiting state
-        if (0 < this.baseMapper.updateStateToWaiting(sta.getId()
+        int changed = this.baseMapper.updateStateToWaiting(sta.getId()
                 , task.getId()
                 , type.toString()
-                , StaReserveStateType.WAITING.toString())) {
+                , StaReserveStateType.WAITING.toString()
+                , WAITING_EXPIRE_TIME
+        );
+        if (changed > 0) {
             return true;
         }
 
@@ -141,6 +145,14 @@
     }
 
     @Override
+    public Boolean rollbackWaitingToReserved(Sta sta, Task currTask, StaReserveType staReserveType) {
+
+        rollbackWaitingToReserved
+
+        return null;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public void confirmStaReserve(Sta sta, Task task, Integer qty, StaReserveType type) {
         qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);

--
Gitblit v1.9.1