From a82e723237a11f8e8553412dad4c2d98b925e265 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 13 Sep 2024 15:16:34 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A1=8C=E5=9E=8B=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/controller/TbCallTableController.java | 9 ++++++++-
 .../system/cashierservice/service/TbCallService.java     | 2 ++
 .../cashierservice/service/impl/TbCallServiceImpl.java   | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

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 73c86b4..14b1039 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java
@@ -31,7 +31,7 @@ public class TbCallTableController {
      * @param shopId 店铺id
      * @return data
      */
-    @GetMapping
+    @GetMapping("queue")
     public Result get(
             @RequestParam String openId,
             @RequestParam Integer shopId
@@ -39,4 +39,11 @@ public class TbCallTableController {
         return Result.successWithData(tbCallService.getList(shopId, openId));
     }
 
+    @GetMapping
+    public Result getList(
+            @RequestParam Integer shopId
+    ) {
+        return Result.successWithData(tbCallService.getAllInfo(shopId));
+    }
+
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java
index 655f0e2..3a2dd59 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java
@@ -6,4 +6,6 @@ public interface TbCallService {
     Object takeNumber(TakeNumberDTO takeNumberDTO);
 
     Object getList(Integer shopId, String openId);
+
+    Object getAllInfo(Integer shopId);
 }
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 f0a260f..43db758 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
@@ -95,4 +95,9 @@ public class TbCallServiceImpl implements TbCallService {
     public Object getList(Integer shopId, String openId) {
         return callQueueMapper.selectInfoByOpenId(shopId, openId);
     }
+
+    @Override
+    public Object getAllInfo(Integer shopId) {
+        return callTableService.lambdaQuery().eq(TbCallTable::getShopId, shopId).eq(TbCallTable::getState, 1).list();
+    }
 }