From 034df443733b65cf5eefaf66638c6bb5c2d464f4 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 18 Oct 2024 15:23:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8F=B7=E4=BA=BA=E6=95=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/TbCallQueueMapper.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/TbCallQueueMapper.xml b/src/main/resources/mapper/TbCallQueueMapper.xml
index bd8c208..2e732c7 100644
--- a/src/main/resources/mapper/TbCallQueueMapper.xml
+++ b/src/main/resources/mapper/TbCallQueueMapper.xml
@@ -52,6 +52,7 @@
         and c.shop_id=a.shop_id		-- 同一张桌子
         AND c.create_time &lt; a.create_time  -- 在当前用户之前排队
         AND c.state IN (0, 1)  -- 排队中或等待中的人
+        AND c.create_day=#{today}
         ) AS waiting_count,  -- 前面有几个人
         (
         SELECT COUNT(1) * b.wait_time
@@ -61,6 +62,7 @@
         AND c.shop_id=a.shop_id			-- 同一张桌子
         AND c.create_time &lt; a.create_time  -- 在当前用户之前排队
         AND c.state IN (0, 1)  -- 排队中或等待中的人
+        AND c.create_day=#{today}
         ) AS wait_time  -- 预计等待时间
         FROM
         tb_call_queue a
@@ -80,7 +82,7 @@
             and a.open_id = #{openId}  -- 替换为目标用户的 open_id
         </if>
 
-        and a.state != 3
+        and a.state in (0, 1)
         GROUP BY
         a.id, a.user_id, b.name, b.note, b.wait_time
         ORDER BY