From fd306f34dc9fc370b0ad1616cf7bd4f2af962b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 11 Nov 2025 10:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B8=85=E5=8F=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/ShopTableController.java | 26 +++++++++++++++++--
 .../dto/table/ShopTableEditBatchDTO.java      |  2 +-
 .../com/czg/account/entity/ShopTable.java     |  1 +
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java
index e01b2e9a8..e063e7314 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopTableController.java
@@ -20,6 +20,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.io.Serializable;
+import java.util.Map;
 
 /**
  * 台桌管理
@@ -99,8 +101,8 @@ public class ShopTableController {
     @PutMapping("/batch")
     public CzgResult<Boolean> editBatch(@RequestBody @Validated ShopTableEditBatchDTO shopTableDTO) {
         UpdateChain<ShopTable> query = shopTableService.updateChain().eq(ShopTable::getShopId, StpKit.USER.getShopId());
-        if (shopTableDTO.getClearTime() != null) {
-            query.eq(ShopTable::getClearTime, shopTableDTO.getClearTime());
+        if (shopTableDTO.getAutoClearTime() != null) {
+            query.eq(ShopTable::getAutoClearTime, shopTableDTO.getAutoClearTime());
         }
 
         if (shopTableDTO.getAutoClear() != null) {
@@ -109,6 +111,26 @@ public class ShopTableController {
         return CzgResult.success(query.update());
     }
 
+
+    /**
+     * 获取清台配置信息
+     * 权限标识: shopTable:edit
+     * @return 是否成功
+     */
+    @GetMapping("/currentState")
+    public CzgResult<Map<String, Serializable>> currentState() {
+        ShopTable one = shopTableService.queryChain().eq(ShopTable::getShopId, StpKit.USER.getShopId()).limit(1).one();
+        if (one == null) {
+            one = new ShopTable();
+            one.setAutoClear(0);
+            one.setAutoClearTime(0);
+        }
+        return CzgResult.success(Map.of(
+                "autoClear", one.getAutoClear(),
+                "autoClearTime", one.getAutoClearTime()
+        ));
+    }
+
     /**
      * 台桌清台
      * 权限标识: shopTable:clear
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableEditBatchDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableEditBatchDTO.java
index 86eb6bae6..4be26070f 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableEditBatchDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/table/ShopTableEditBatchDTO.java
@@ -30,7 +30,7 @@ public class ShopTableEditBatchDTO implements Serializable {
     /**
      * 自动清台时间 单位分钟 默认10
      */
-    private Integer clearTime;
+    private Integer autoClearTime;
 
 
 }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java
index 13932e813..c91126bed 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java
@@ -127,6 +127,7 @@ public class ShopTable implements Serializable {
     private Integer useNum;
 
     private Integer autoClear;
+    private Integer autoClearTime;
 
     public boolean canUseByStatus() {
         return !ShopTableStatusEnum.UNBOUND.equalsVal(status)