From 0a89b6d67ceee4c458c1b6aef510205e3df45d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 16 Dec 2024 16:54:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BD=AC=E6=A1=8C=E4=B8=8D=E6=89=93?=
 =?UTF-8?q?=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/controller/OrderController.java  |  2 +-
 .../system/cashierservice/service/OrderService.java | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
index 4a00dca..7ff72a8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
@@ -140,7 +140,7 @@ public class OrderController {
         String userId = jsonObject.getString("accountId");
         orderVo.setMerchantId(Integer.valueOf(userId));
         orderVo.setUserId(jsonObject.getString("staffId"));
-        return orderService.createOrder(orderVo, clientType, token, null);
+        return orderService.createOrder(orderVo, clientType, token, null, true);
     }
 
     /**
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 85f8652..e183229 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -884,7 +884,7 @@ public class OrderService {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public Result createOrder(OrderVo orderVo, String clientType, String token, Integer oldOrderId) {
+    public Result createOrder(OrderVo orderVo, String clientType, String token, Integer oldOrderId, boolean isPrint) {
         TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(orderVo.getShopId());
         if (shopInfo == null) {
             throw new MsgException("店铺信息不存在");
@@ -1214,12 +1214,12 @@ public class OrderService {
                     .set(TbShopTable::getStatus, TableStateEnum.USING.getState()));
 
             // 打印票据
-            if (!addOrderDetailList.isEmpty()) {
+            if (!addOrderDetailList.isEmpty() && isPrint) {
                 log.info("待打印菜品信息: {}", addOrderDetailList);
                 rabbitMsgUtils.printDishesTicket(orderInfo.getId(), false, addOrderDetailList.toArray(new TbOrderDetail[0]));
             }
 
-            if (!removedOrderDetailList.isEmpty()) {
+            if (!removedOrderDetailList.isEmpty() && isPrint) {
                 log.info("待打印退菜菜品信息: {}", removedOrderDetailList);
                 // 退单票
                 rabbitMsgUtils.printDishesTicket(orderInfo.getId(), true, removedOrderDetailList.toArray(new TbOrderDetail[0]));
@@ -1382,7 +1382,7 @@ public class OrderService {
             orderVo.setTableId(tableId);
             JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
             orderVo.setMerchantId(Integer.valueOf(jsonObject.getString("accountId")));
-            Result result = createOrder(orderVo, clientType, token, null);
+            Result result = createOrder(orderVo, clientType, token, null, true);
             if (!"0".equals(result.getCode())) {
                 return result;
             }
@@ -2503,7 +2503,7 @@ public class OrderService {
             JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
             String userId = jsonObject.getString("accountId");
             createOrderDTO.setMerchantId(Integer.valueOf(userId));
-            createOrder(createOrderDTO, "pc", token, switchTableDTO.getOrderId());
+            createOrder(createOrderDTO, "pc", token, switchTableDTO.getOrderId(), false);
         }
 
         if (targetOrderId != null) {
@@ -2515,9 +2515,10 @@ public class OrderService {
             JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
             String userId = jsonObject.getString("accountId");
             createOrderDTO.setMerchantId(Integer.valueOf(userId));
-            createOrder(createOrderDTO, "pc", token, targetOrderId);
+            createOrder(createOrderDTO, "pc", token, targetOrderId, false);
         }
 
+
         return true;
 
     }