From efabc6ba991acfd01d38bb0bf4e8cfd772416617 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 13:07:39 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 61 insertions(+), 4 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 a00deae..9dee9af 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
@@ -1,6 +1,8 @@
 package com.zy.acs.manager.manager.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.acs.framework.common.Cools;
 import com.zy.acs.manager.common.exception.BusinessException;
 import com.zy.acs.manager.manager.entity.Sta;
 import com.zy.acs.manager.manager.entity.StaReserve;
@@ -17,12 +19,17 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 @Service("staReserveService")
 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;
 
     @Autowired
     private StaService staService;
@@ -32,7 +39,7 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public StaReserve reserveStaIn(Sta sta, Task task, Integer qty) {
-        qty = Optional.ofNullable(qty).orElse(1);
+        qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
 
         // reserve sta in
         if (staMapper.tryReserveIn(sta.getId(), qty) < qty) {
@@ -66,7 +73,7 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public StaReserve reserveStaOut(Sta sta, Task task, Integer qty) {
-        qty = Optional.ofNullable(qty).orElse(1);
+        qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
 
         // reserve sta out
         if (staMapper.tryReserveOut(sta.getId(), qty) < qty) {
@@ -100,8 +107,58 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public Boolean waitingStaReserve(Sta sta, Task task, Integer qty, StaReserveType type) {
+        qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
+
+        // update reserve to be waiting state
+        int changed = this.baseMapper.updateStateToWaiting(task.getId()
+                , sta.getId()
+                , type.toString()
+                , StaReserveStateType.WAITING.toString()
+                , WAITING_EXPIRE_TIME
+        );
+        if (changed > 0) {
+            return true;
+        }
+
+        List<StaReserve> list = this.list(new LambdaQueryWrapper<StaReserve>()
+                .eq(StaReserve::getStaId, sta.getId())
+                .eq(StaReserve::getTaskId, task.getId())
+                .eq(StaReserve::getType, type.toString())
+                .eq(StaReserve::getStatus, StatusType.ENABLE.val)
+        );
+
+        if (Cools.isEmpty(list)) {
+            return false;
+        }
+        StaReserve reserve = list.get(0);
+
+        StaReserveStateType stateType = StaReserveStateType.of(reserve.getState());
+        switch (Objects.requireNonNull(stateType)) {
+            case WAITING:
+            case CONFIRMED:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public Boolean rollbackWaitingToReserved(Sta sta, Task task, StaReserveType type) {
+        int changed = this.baseMapper.updateStateBackToWaiting(
+                task.getId()
+                , sta.getId()
+                , type.toString()
+                , StaReserveStateType.RESERVED.toString()
+                , WAITING_EXPIRE_TIME
+        );
+        return changed > 0;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public void confirmStaReserve(Sta sta, Task task, Integer qty, StaReserveType type) {
-        qty = Optional.ofNullable(qty).orElse(1);
+        qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
 
         // update reserve state to be confirmed
         if (0 == this.baseMapper.updateState(task.getId(), sta.getId(), type.toString(), StaReserveStateType.CONFIRMED.toString())) {
@@ -127,7 +184,7 @@
 
     @Override
     public void cancelStaReserve(Sta sta, Task task, Integer qty, StaReserveType type) {
-        qty = Optional.ofNullable(qty).orElse(1);
+        qty = Optional.ofNullable(qty).orElse(DEFAULT_QTY);
 
         // update reserve state to be canceled
         if (0 == this.baseMapper.updateState(task.getId(), sta.getId(), type.toString(), StaReserveStateType.CANCELLED.toString())) {

--
Gitblit v1.9.1