From 2ce1d30f06a00d6469ca9487ebfab290e321007e 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, 1 Apr 2025 18:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AB=E5=8F=B7=E5=8F=96=E6=B6=88=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/user/UCallTableController.java | 11 +++++++++++
 .../com/czg/account/service/CallTableService.java     |  2 ++
 .../account/service/impl/CallTableServiceImpl.java    |  9 +++++++++
 3 files changed, 22 insertions(+)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UCallTableController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UCallTableController.java
index 27a7ab00..ce419e4e 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/user/UCallTableController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UCallTableController.java
@@ -77,5 +77,16 @@ public class UCallTableController {
         return CzgResult.success(callTableService.subMsg(subMsgDTO));
     }
 
+    /**
+     * 取消订阅
+     * @param queueId 队列id
+     * @param shopId 店铺id
+     * @return 是否成功
+     */
+    @DeleteMapping("/cancel")
+    public CzgResult<Boolean> cancel(@RequestParam Long queueId, @RequestParam Long shopId) {
+        return CzgResult.success(callTableService.cancel(shopId, queueId));
+    }
+
 
 }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/CallTableService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/CallTableService.java
index 5a6948d2..bc664c35 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/CallTableService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/CallTableService.java
@@ -40,4 +40,6 @@ public interface CallTableService extends IService<CallTable> {
     boolean subMsg(CallSubMsgDTO subMsgDTO);
 
     Object getStatus(Long shopId, String openId, Long queueId);
+
+    Boolean cancel(Long shopId, Long queueId);
 }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java
index 3d81f708..1efa7d18 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java
@@ -613,4 +613,13 @@ public class CallTableServiceImpl extends ServiceImpl<CallTableMapper, CallTable
         data.put("queueInfo", callQueueInfoVOS.isEmpty() ? null : callQueueInfoVOS.getFirst());
         return data;
     }
+
+    @Override
+    public Boolean cancel(Long shopId, Long queueId) {
+        return callQueueService.updateChain()
+                .eq(CallQueue::getShopId, shopId)
+                .eq(CallQueue::getId, queueId)
+                .set(CallQueue::getCallTime, DateUtil.date())
+                .set(CallQueue::getState, -1).update();
+    }
 }