From 98468c48728c8ca7c6082da54505b3982017260b Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 17 Apr 2026 14:10:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E5=8A=A0=E7=B2=97=20=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/mq/PrintMqListener.java           | 2 +-
 .../main/java/com/czg/service/order/print/PrinterImpl.java  | 6 +++---
 .../main/java/com/czg/service/order/print/YxyPrinter.java   | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java
index 559078a2a..7c207fcd2 100644
--- a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java
+++ b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java
@@ -70,8 +70,8 @@ public class PrintMqListener {
                     printConfig.orderHandler(orderId, PrinterHandler.PrintTypeEnum.ORDER, null);
                 }
                 //菜品打印 全是后端
-                printConfig.orderHandler(orderId, PrinterHandler.PrintTypeEnum.ONLY_KITCHEN, null);
                 printConfig.orderHandler(orderId, PrinterHandler.PrintTypeEnum.ALL_KITCHEN, null);
+                printConfig.orderHandler(orderId, PrinterHandler.PrintTypeEnum.ONLY_KITCHEN, null);
                 return null;
             }, RedisCst.getLockKey("orderPrint", orderId));
         });
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
index e246b53bb..73be21914 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
@@ -441,14 +441,14 @@ public interface PrinterImpl {
                         });
                     }
                 }
-                if (StrUtil.isNotBlank(detail.getRemark()) && "null".equals(detail.getRemark())) {
+                if (StrUtil.isNotBlank(detail.getRemark()) && !"null".equals(detail.getRemark())) {
                     data.append(getFormatLabel(StrUtil.format(" 备注：{}", detail.getRemark()), signLabelInfo.s)).append(signLabelInfo.br);
                 }
             }
             data.append(getDividingLine())
                     .append(signLabelInfo.br);
         }
-        if (StrUtil.isNotBlank(orderPrintDTO.getRemark()) && "null".equals(orderPrintDTO.getRemark())) {
+        if (StrUtil.isNotBlank(orderPrintDTO.getRemark()) && !"null".equals(orderPrintDTO.getRemark())) {
             data.append(getFormatLabel(StrUtil.format("备注: {}", orderPrintDTO.getRemark()), signLabelInfo.s)).append(signLabelInfo.br);
             data.append(getDividingLine()).append(signLabelInfo.br);
         }
@@ -506,7 +506,7 @@ public interface PrinterImpl {
                         .append(signLabelInfo.br);
             }
         }
-        if (StrUtil.isNotBlank(orderDetail.getRemark())) {
+        if (StrUtil.isNotBlank(orderDetail.getRemark()) && !"null".equals(orderDetail.getRemark())) {
             builder.append(getFormatLabel(StrUtil.format("备注：{}", orderDetail.getRemark()), signLabelInfo.f))
                     .append(signLabelInfo.br);
         }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java
index dfca6dde9..8ea0923d1 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java
@@ -51,8 +51,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
             .setCenter(new String[]{"<C>", "</C>"})
             .setCenterBold(new String[]{"<CB>", "</CB>"})
             .setRs("RS")
-            .setBr("<BR>")
-            .setBold(new String[]{"<B>", "</B>"});
+            .setBold(new String[]{"<BOLD>", "</BOLD>"});
 
 
     @Override