From 039f7efec3554d1366900380478a63bd42d9d359 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 19 Sep 2024 14:27:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=20?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=87=86=E7=A1=AE?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/TbCallQueueMapper.xml    | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mapper/TbCallQueueMapper.xml b/src/main/resources/mapper/TbCallQueueMapper.xml
index 982c913..9e03e10 100644
--- a/src/main/resources/mapper/TbCallQueueMapper.xml
+++ b/src/main/resources/mapper/TbCallQueueMapper.xml
@@ -35,31 +35,46 @@
     <select id="selectInfoByOpenId"
             resultType="com.chaozhanggui.system.cashierservice.entity.vo.CallQueueInfoVO">
         SELECT
-        d.shop_name, d.logo, d.status as shop_state,
+        d.shop_name,
+        d.logo,
+        d.status AS shop_state,
         a.call_num,
         a.id,  -- 用户的排队记录ID
         a.state,
         a.user_id,  -- 用户ID
         b.name AS table_name,  -- 桌子名称
         b.note AS table_note,  -- 桌子备注
-        COUNT(c.id) AS waiting_count,  -- 前面有几个人
-        COUNT(c.id) * b.wait_time AS wait_time  -- 预计等待时间
+        (
+        SELECT COUNT(1)
+        FROM tb_call_queue c
+        WHERE
+        c.call_table_id = a.call_table_id
+        and c.shop_id=a.shop_id		-- 同一张桌子
+        AND c.create_time &lt; a.create_time  -- 在当前用户之前排队
+        AND c.state IN (0, 1)  -- 排队中或等待中的人
+        ) AS waiting_count,  -- 前面有几个人
+        (
+        SELECT COUNT(1) * b.wait_time
+        FROM tb_call_queue c
+        WHERE
+        c.call_table_id = a.call_table_id
+        AND c.shop_id=a.shop_id			-- 同一张桌子
+        AND c.create_time &lt; a.create_time  -- 在当前用户之前排队
+        AND c.state IN (0, 1)  -- 排队中或等待中的人
+        ) AS wait_time  -- 预计等待时间
         FROM
         tb_call_queue a
-        left join tb_shop_info d on a.shop_id=d.id
+        LEFT JOIN
+        tb_shop_info d ON a.shop_id = d.id
         LEFT JOIN
         tb_call_table b ON a.call_table_id = b.id
-        LEFT JOIN
-        tb_call_queue c ON c.call_table_id = a.call_table_id
-
-        AND c.create_time &lt; a.create_time
-        AND c.state IN (0, 1)  -- 前面的人
         WHERE
-        a.open_id=#{openId} and a.shop_id=#{shopId} and a.create_day=#{today}  -- 替换为目标用户的user_id
+        a.open_id = #{openId}  -- 替换为目标用户的 open_id
+        AND a.shop_id = #{shopId}
+        AND a.create_day = #{today}  -- 替换为目标日期
         GROUP BY
         a.id, a.user_id, b.name, b.note, b.wait_time
         ORDER BY
         a.create_time ASC;
-
     </select>
 </mapper>