From 319a8e13c5406d0bbb7d43fb768aa3a77cf0b27d Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 14 Sep 2024 17:37:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=20?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/rabbit/PrintMechineConsumer.java   | 2 +-
 src/main/resources/mapper/TbCallQueueMapper.xml              | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
index 77299dc..803a735 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
@@ -87,7 +87,7 @@ public class PrintMechineConsumer {
             log.info("打印机列表，{}", ArrayUtil.toString(list));
             log.info("待打印订单信息, {}", orderInfo);
 
-            list.parallelStream().forEach(tbPrintMachineWithBLOBs->{
+            list.forEach(tbPrintMachineWithBLOBs->{
                 if (!"network".equals(tbPrintMachineWithBLOBs.getConnectionType())) {
                     log.error("非网络打印机:{},{}",tbPrintMachineWithBLOBs.getAddress(),tbPrintMachineWithBLOBs.getConnectionType());
                     return;
diff --git a/src/main/resources/mapper/TbCallQueueMapper.xml b/src/main/resources/mapper/TbCallQueueMapper.xml
index bd8f54c..982c913 100644
--- a/src/main/resources/mapper/TbCallQueueMapper.xml
+++ b/src/main/resources/mapper/TbCallQueueMapper.xml
@@ -35,7 +35,7 @@
     <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,
@@ -46,11 +46,12 @@
         COUNT(c.id) * b.wait_time AS wait_time  -- 预计等待时间
         FROM
         tb_call_queue a
+        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
-        left join tb_shop_info d on a.shop_id=d.id
+
         AND c.create_time &lt; a.create_time
         AND c.state IN (0, 1)  -- 前面的人
         WHERE