From dcdcbe3b61752600534f7d4ffa86bc5c9acfbec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Thu, 17 Oct 2024 11:31:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=E5=B0=8F?=
 =?UTF-8?q?=E7=A5=A8=E6=9C=AA=E6=89=93=E5=8D=B0BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rabbit/print/PrinterHandler.java          | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java
index fabc045..a926ca7 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java
@@ -41,22 +41,24 @@ public abstract class PrinterHandler {
 
     protected void print(TbPrintMachine machine, boolean isReturn, TbOrderInfo orderInfo, List<TbOrderDetail> tbOrderDetailList, CallNumPrintDTO printDTO) {
         String printMethod = machine.getPrintMethod();
-        if (StrUtil.isBlank(printMethod)) {
+        if (StrUtil.isBlank(printMethod) && StrUtil.isBlank(machine.getPrintType())) {
             throw new MsgException("打印机配置为空");
         }
-        List<CategoryInfo> categoryInfos = JSONUtil.parseJSONStr2TList(StrUtil.emptyToDefault(machine.getCategoryList(), "[]"), CategoryInfo.class);
-        //仅打印后厨-一菜一品
-        if ("one".equals(printMethod)) {
-            onlyKitchen(machine, orderInfo, tbOrderDetailList, categoryInfos, isReturn);
-        } else if ("normal".equals(printMethod)) {
-            //仅打印前台
-            onlyFrontDesk(machine, orderInfo, tbOrderDetailList, isReturn);
-        } else if ("all".equals(printMethod)) {
-            //全部打印 前台+后厨
-            onlyFrontDesk(machine, orderInfo, tbOrderDetailList, isReturn);
-            onlyKitchen(machine, orderInfo, tbOrderDetailList, categoryInfos, isReturn);
-        } else {
-            log.warn("未知打印类型: {}", printMethod);
+        if(StrUtil.isNotBlank(printMethod)){
+            List<CategoryInfo> categoryInfos = JSONUtil.parseJSONStr2TList(StrUtil.emptyToDefault(machine.getCategoryList(), "[]"), CategoryInfo.class);
+            //仅打印后厨-一菜一品
+            if ("one".equals(printMethod)) {
+                onlyKitchen(machine, orderInfo, tbOrderDetailList, categoryInfos, isReturn);
+            } else if ("normal".equals(printMethod)) {
+                //仅打印前台
+                onlyFrontDesk(machine, orderInfo, tbOrderDetailList, isReturn);
+            } else if ("all".equals(printMethod)) {
+                //全部打印 前台+后厨
+                onlyFrontDesk(machine, orderInfo, tbOrderDetailList, isReturn);
+                onlyKitchen(machine, orderInfo, tbOrderDetailList, categoryInfos, isReturn);
+            } else {
+                log.warn("未知打印类型: {}", printMethod);
+            }
         }
         if (StrUtil.isBlank(machine.getPrintType())) {
             return;
@@ -71,9 +73,6 @@ public abstract class PrinterHandler {
             return;
         }
         callNumPrint(machine, printDTO);
-        if (StrUtil.isBlank(printMethod)) {
-            throw new MsgException("打印机配置为空");
-        }
     }
 
     /**