From 119b6ba9c7163aed4a2d8bfb810bca0a2606c863 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 2 Sep 2024 10:31:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8B=E5=8D=95=E4=B8=8D=E6=89=93=E7=A5=A8?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/rabbit/PrintMechineConsumer.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 0844c1f..436d07e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
@@ -190,12 +190,14 @@ public class PrintMechineConsumer {
                         cashierCarts = tbCashierCartMapper.selectByOrderId(orderId,"final");
                         if (ObjectUtil.isNotEmpty(cashierCarts) && cashierCarts.size() > 0) {
 
-                            // 取餐号不为空为代客下单
-                            if ("postPay".equals(orderInfo.getUseType())) {
-                                return;
-                            }
+
                             cashierCarts.parallelStream().forEach(it -> {
 
+                                // 取餐号不为空为代客下单
+                                if ("postPay".equals(orderInfo.getUseType()) && StrUtil.isNotBlank(it.getMasterId())) {
+                                    return;
+                                }
+
                                 String categoryId;
                                 if(ObjectUtil.isEmpty(it.getCategoryId())){
                                     categoryId=  tbProductMapper.selectByPrimaryKey(Integer.valueOf(it.getProductId())).getCategoryId();