排队取号修改

src/main/resources/mapper/TbCallQueueMapper.xml

@@ -71,12 +71,16 @@
         WHERE
         a.shop_id = #{shopId}
         AND a.create_day = #{today}  -- 替换为目标日期
-            <if test="openId != null and openId != ''">
-               and (a.open_id = #{openId} or a.open_id is null)  -- 替换为目标用户的 open_id
-            </if>
+
         <if test="queueId != null">
-            and a.id = #{queueId}  -- 替换为目标用户的 open_id
+            and a.id = #{queueId} and (a.open_id = #{openId} or a.open_id is null)
         </if>
+
+        <if test="queueId == null">
+            and a.open_id = #{openId}  -- 替换为目标用户的 open_id
+        </if>
+
+        and a.state != 3
         GROUP BY
         a.id, a.user_id, b.name, b.note, b.wait_time
         ORDER BY