From fa662d3d7af1b504350843fd9faab82df51e713a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 1 Apr 2025 16:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/config/RabbitPublisher.java         | 4 +++-
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java
index a62e6b96..3d2615f2 100644
--- a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java
+++ b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java
@@ -55,7 +55,9 @@ public class RabbitPublisher {
         //厨房票
         sendMsg(RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE, new JSONObject().fluentPut("orderId", orderId).fluentPut("printOrder", printOrder).toString());
         //前台票
-        sendMsg(RabbitConstants.Queue.ORDER_PRINT_QUEUE, orderId);
+        if (printOrder) {
+            sendMsg(RabbitConstants.Queue.ORDER_PRINT_QUEUE, orderId);
+        }
     }
 
     /**
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index d7eb4062..1536b8a7 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -32,6 +32,7 @@ import com.czg.order.service.OrderInfoService;
 import com.czg.order.service.OrderPaymentService;
 import com.czg.order.vo.*;
 import com.czg.resp.CzgResult;
+import com.czg.sa.StpKit;
 import com.czg.service.RedisService;
 import com.czg.service.order.enums.OrderStatusEnums;
 import com.czg.service.order.mapper.OrderInfoMapper;
@@ -165,7 +166,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 .eq(OrderInfo::getTradeDay, historyOrderVo.getTradeDay())
                 .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
                 .eq(OrderInfo::getShopId, historyOrderVo.getShopId())
-                .le(OrderInfo::getCreateTime,historyOrderVo.getCreateTime()).count();
+                .le(OrderInfo::getCreateTime, historyOrderVo.getCreateTime()).count();
         historyOrderVo.setOrderNum(count);
         return CzgResult.success(historyOrderVo);
     }
@@ -179,6 +180,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if (orderId == null) {
             historyOrderVo = queryChain()
                     .select()
+                    .eq(OrderInfo::getShopId, StpKit.USER.getShopId())
                     .eq(OrderInfo::getTableCode, tableCode)
                     .eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode())
                     .gt(OrderInfo::getCreateTime, DateUtil.offsetDay(new Date(), -1))