From 7b996aff93f6d91a3dd307b2c81a238c71d74457 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 23 Sep 2024 16:54:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=20?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E5=90=8C=E4=B8=80=E5=BE=AE=E4=BF=A1=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TbCallTableController.java     |  7 ++-----
 .../service/impl/TbCallServiceImpl.java       | 20 +++++++++++++++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java
index 8555a47..525db72 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java
@@ -37,13 +37,10 @@ public class TbCallTableController {
      */
     @GetMapping("queue")
     public Result get(
-            @RequestParam(required = false) String openId,
+            @RequestParam String openId,
             @RequestParam Integer shopId,
             @RequestParam(required = false) Integer queueId
     ) {
-        if (StrUtil.isBlank(openId) && queueId == null) {
-            return Result.fail("shopId和queueId不能同时为空");
-        }
         return Result.successWithData(tbCallService.getList(shopId, openId, queueId));
     }
 
@@ -73,7 +70,7 @@ public class TbCallTableController {
         return Result.successWithData(tbCallService.getState(openId, shopId, queueId));
     }
 
-    @PutMapping("subMsg")
+    @PostMapping("subMsg")
     public Result subMsg(
             @Validated @RequestBody CallSubMsgDTO subMsgDTO
     ) {
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
index ddb17f2..3f2e4a8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
@@ -85,7 +85,7 @@ public class TbCallServiceImpl implements TbCallService {
         }
 
         TbCallQueue callQueue = callQueueService.lambdaQuery()
-                .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone())
+//                .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone())
                 .eq(TbCallQueue::getOpenId, takeNumberDTO.getOpenId())
                 .eq(TbCallQueue::getShopId, takeNumberDTO.getShopId())
                 .eq(TbCallQueue::getCreateDay, DateUtil.today())
@@ -97,7 +97,7 @@ public class TbCallServiceImpl implements TbCallService {
         }
 
         callQueue = BeanUtil.copyProperties(takeNumberDTO, TbCallQueue.class);
-        callQueue.setSubState(1);
+        callQueue.setSubState(0);
         callQueue.setCreateTime(DateUtil.date());
         callQueue.setShopId(shopInfo.getId());
         callQueue.setShopName(shopInfo.getShopName());
@@ -165,6 +165,22 @@ public class TbCallServiceImpl implements TbCallService {
             throw new MsgException("您未排号请先排号");
         }
 
+        if (StrUtil.isNotBlank(queue.getOpenId()) && queue.getSubState() == 1) {
+            throw new MsgException("此号码已被其他用户订阅");
+        }
+
+        Integer count = callQueueService.lambdaQuery()
+//                .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone())
+                .eq(TbCallQueue::getOpenId, subMsgDTO.getOpenId())
+                .eq(TbCallQueue::getShopId, subMsgDTO.getShopId())
+                .eq(TbCallQueue::getCreateDay, DateUtil.today())
+                .in(TbCallQueue::getState, 0, 1)
+                .ne(TbCallQueue::getIsPostpone, 2)
+                .eq(TbCallQueue::getCallTableId, queue.getCallTableId()).count();
+        if (count > 0) {
+            throw new MsgException("您已订阅其他号码，请勿重复订阅");
+        }
+
         queue.setSubState(1);
         queue.setOpenId(subMsgDTO.getOpenId());
         return callQueueMapper.updateById(queue);