From fbe7b72e4b439894e7ddd743028b3fb7afa762c5 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 27 Aug 2024 11:41:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/PayService.java    | 46 +++++--------------
 1 file changed, 11 insertions(+), 35 deletions(-)

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 82b053c..4edc517 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -295,7 +295,7 @@ public class PayService {
 
                     producer.putOrderCollect(jsonObject.toJSONString());
 
-                    if (!orderInfo.getPayType().equals("postPay")) {
+                    if (StrUtil.isNotBlank(orderInfo.getTableId())) {
                         producer.printMechine(orderId);
                     }
 
@@ -305,10 +305,6 @@ public class PayService {
                             .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
 
 
-                    // 打印结算单
-                    if (StrUtil.isNotBlank(orderInfo.getTableId())) {
-                        producer.printMechine(orderId);
-                    }
                     return Result.success(CodeEnum.SUCCESS, object.getJSONObject("data"));
                 } else {
                     String status = ObjectUtil.isNotEmpty(object.getJSONObject("data")) ? object.getJSONObject("data").getString("status") : null;
@@ -378,7 +374,7 @@ public class PayService {
 
                         producer.putOrderCollect(jsonObject.toJSONString());
 
-                        if (!orderInfo.getPayType().equals("postPay")) {
+                        if (StrUtil.isNotBlank(orderInfo.getTableId())) {
                             producer.printMechine(orderId);
                         }
                         // 修改台桌状态
@@ -386,9 +382,7 @@ public class PayService {
                                 .eq(TbShopTable::getQrcode, orderInfo.getTableId())
                                 .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
 // 打印结算单
-                        if (StrUtil.isNotBlank(orderInfo.getTableId())) {
-                            producer.printMechine(orderId);
-                        }
+
 
                         return Result.success(CodeEnum.SUCCESS, mainScanResp);
                     } else if ("TRADE_AWAIT".equals(mainScanResp.getState())) {
@@ -470,9 +464,6 @@ public class PayService {
 
                                 producer.putOrderCollect(jsonObject.toJSONString());
 
-                                if (!orderInfo.getPayType().equals("postPay")) {
-                                    producer.printMechine(orderId);
-                                }
                             }
                         }
                     }
@@ -498,9 +489,6 @@ public class PayService {
 
                                 producer.putOrderCollect(jsonObject.toJSONString());
 
-                                if (!orderInfo.getPayType().equals("postPay")) {
-                                    producer.printMechine(orderId);
-                                }
                             }
                         }
                     }
@@ -642,7 +630,7 @@ public class PayService {
 
         producer.putOrderCollect(jsonObject.toJSONString());
 
-        if (!orderInfo.getPayType().equals("postPay")) {
+        if (StrUtil.isNotBlank(orderInfo.getTableId())) {
             producer.printMechine(orderId);
         }
 
@@ -757,7 +745,7 @@ public class PayService {
 
         producer.putOrderCollect(jsonObject.toJSONString());
 
-        if (!orderInfo.getPayType().equals("postPay")) {
+        if (StrUtil.isNotBlank(orderInfo.getTableId())) {
             producer.printMechine(orderId);
         }
 
@@ -846,7 +834,7 @@ public class PayService {
 
         producer.putOrderCollect(jsonObject.toJSONString());
 
-        if (!orderInfo.getPayType().equals("postPay")) {
+        if (StrUtil.isNotBlank(orderInfo.getTableId())) {
             producer.printMechine(String.valueOf(orderId));
         }
 
@@ -927,7 +915,7 @@ public class PayService {
         producer.putOrderCollect(jsonObject.toJSONString());
 
 
-        if (!orderInfo.getPayType().equals("postPay")) {
+        if (StrUtil.isNotBlank(orderInfo.getTableId())) {
             producer.printMechine(orderId);
         }
 
@@ -945,11 +933,6 @@ public class PayService {
                 .eq(TbShopTable::getQrcode, orderInfo.getTableId())
                 .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
 
-        // 打印结算单
-        if (StrUtil.isNotBlank(orderInfo.getTableId())) {
-            producer.printMechine(orderId);
-        }
-
         return Result.success(CodeEnum.SUCCESS);
     }
 
@@ -1016,7 +999,7 @@ public class PayService {
 
         producer.putOrderCollect(jsonObject.toJSONString());
 
-        if (!orderInfo.getPayType().equals("postPay")) {
+        if (StrUtil.isNotBlank(orderInfo.getTableId())) {
             producer.printMechine(orderId);
         }
 
@@ -1032,10 +1015,6 @@ public class PayService {
         mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
                 .eq(TbShopTable::getQrcode, orderInfo.getTableId())
                 .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
-        // 打印结算单
-        if (StrUtil.isNotBlank(orderInfo.getTableId())) {
-            producer.printMechine(String.valueOf(orderId));
-        }
         return Result.success(CodeEnum.SUCCESS);
     }
 
@@ -1287,8 +1266,8 @@ public class PayService {
 //        jsonObject.put("data",new ReturnWTZInfo(orderId+"",newOrderInfo.getPayAmount(),details));
         producer.putOrderCollect(jsonObject.toJSONString());
 
-        if (!orderInfo.getPayType().equals("postPay")) {
-            producer.printMechine(String.valueOf(newOrderInfo.getId()));
+        if (StrUtil.isNotBlank(orderInfo.getTableId())) {
+            producer.printMechine(String.valueOf(orderId));
         }
 
 
@@ -1352,10 +1331,7 @@ public class PayService {
                 .eq(TbShopTable::getQrcode, orderInfo.getTableId())
                 .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
 
-        // 打印结算单
-        if (StrUtil.isNotBlank(orderInfo.getTableId())) {
-            producer.printMechine(String.valueOf(orderId));
-        }
+
         return Result.success(CodeEnum.SUCCESS);
     }