From 5e6c6284ed20390fd5e69b171e2ddce681258cbd Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 26 Aug 2024 13:57:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=8F=9C=E5=93=81=E5=B0=8F=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/OrderService.java  |  4 ++
 .../cashierservice/service/PayService.java    | 41 ++++++++++++++-----
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index f4555f0..8425ee4 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -634,6 +634,10 @@ public class OrderService {
             tbOrderInfoMapper.insert(orderInfo);
             redisUtil.saveMessage(RedisCst.OUT_NUMBER.concat(orderInfo.getShopId()),object.toString());
             orderId = orderInfo.getId();
+
+            if (StrUtil.isNotBlank(orderVo.getTableId())) {
+                producer.printMechine(String.valueOf(orderId));
+            }
         }
         for (TbOrderDetail orderDetail : orderDetails) {
             orderDetail.setOrderId(orderId);
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 08f6080..055226f 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -299,7 +299,9 @@ public class PayService {
 
                     producer.putOrderCollect(jsonObject.toJSONString());
 
-                    producer.printMechine(orderId);
+                    if (!orderInfo.getPayType().equals("postPay")) {
+                        producer.printMechine(orderId);
+                    }
 
                     // 修改台桌状态
                     mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
@@ -374,7 +376,9 @@ public class PayService {
 
                         producer.putOrderCollect(jsonObject.toJSONString());
 
-                        producer.printMechine(orderId);
+                        if (!orderInfo.getPayType().equals("postPay")) {
+                            producer.printMechine(orderId);
+                        }
                         // 修改台桌状态
                         mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
                                 .eq(TbShopTable::getQrcode, orderInfo.getTableId())
@@ -458,7 +462,9 @@ public class PayService {
 
                                 producer.putOrderCollect(jsonObject.toJSONString());
 
-                                producer.printMechine(orderId);
+                                if (!orderInfo.getPayType().equals("postPay")) {
+                                    producer.printMechine(orderId);
+                                }
                             }
                         }
                     }
@@ -484,7 +490,9 @@ public class PayService {
 
                                 producer.putOrderCollect(jsonObject.toJSONString());
 
-                                producer.printMechine(orderId);
+                                if (!orderInfo.getPayType().equals("postPay")) {
+                                    producer.printMechine(orderId);
+                                }
                             }
                         }
                     }
@@ -623,7 +631,9 @@ public class PayService {
 
         producer.putOrderCollect(jsonObject.toJSONString());
 
-        producer.printMechine(orderId);
+        if (!orderInfo.getPayType().equals("postPay")) {
+            producer.printMechine(orderId);
+        }
 
         // 发送库存记录mq消息
         JSONObject mqData = new JSONObject();
@@ -736,7 +746,9 @@ public class PayService {
 
         producer.putOrderCollect(jsonObject.toJSONString());
 
-        producer.printMechine(orderId);
+        if (!orderInfo.getPayType().equals("postPay")) {
+            producer.printMechine(orderId);
+        }
 
         // 发送库存记录mq消息
         JSONObject mqData = new JSONObject();
@@ -822,8 +834,9 @@ public class PayService {
 
         producer.putOrderCollect(jsonObject.toJSONString());
 
-
-        producer.printMechine(String.valueOf(orderId));
+        if (!orderInfo.getPayType().equals("postPay")) {
+            producer.printMechine(String.valueOf(orderId));
+        }
 
         // 发送库存记录mq消息
         JSONObject mqData = new JSONObject();
@@ -901,7 +914,9 @@ public class PayService {
         producer.putOrderCollect(jsonObject.toJSONString());
 
 
-        producer.printMechine(orderId);
+        if (!orderInfo.getPayType().equals("postPay")) {
+            producer.printMechine(orderId);
+        }
 
         // 发送库存记录mq消息
         JSONObject mqData = new JSONObject();
@@ -983,7 +998,9 @@ public class PayService {
 
         producer.putOrderCollect(jsonObject.toJSONString());
 
-        producer.printMechine(orderId);
+        if (!orderInfo.getPayType().equals("postPay")) {
+            producer.printMechine(orderId);
+        }
 
         // 发送库存记录mq消息
         JSONObject mqData = new JSONObject();
@@ -1241,7 +1258,9 @@ public class PayService {
 //        jsonObject.put("data",new ReturnWTZInfo(orderId+"",newOrderInfo.getPayAmount(),details));
         producer.putOrderCollect(jsonObject.toJSONString());
 
-        producer.printMechine(String.valueOf(newOrderInfo.getId()));
+        if (!orderInfo.getPayType().equals("postPay")) {
+            producer.printMechine(String.valueOf(newOrderInfo.getId()));
+        }