From 18e401f5b043425133e70d644f180595f3846884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Fri, 29 Nov 2024 10:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A5=A8=E6=89=93=E5=8D=B0bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/rabbit/print/PrinterHandler.java    | 4 +++-
 .../chaozhanggui/system/cashierservice/util/PrinterUtils.java | 4 ++--
 2 files changed, 5 insertions(+), 3 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 e2d87a5..b533e7f 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
@@ -90,7 +90,9 @@ public abstract class PrinterHandler {
             if (isTemporary == 1) {
                 item.setProductId(0);
                 item.setProductSkuId(0);
-                item.setProductName("【临】" + item.getProductName());
+                if(!item.getProductName().startsWith("【临】")){
+                    item.setProductName("【临】" + item.getProductName());
+                }
             }
             // 台位费不打印
             if (item.getProductId().equals(-999)) {
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
index 03ef9f1..15c7830 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
@@ -89,12 +89,12 @@ public class PrinterUtils {
         builder.append("<S><L>时间: ").append(date).append(" </L></S><BR><BR><BR>");
         remark = StrUtil.emptyToDefault(remark, "");
         if (productName.length() > 4 || remark.length() > 4) {
-            builder.append("<CS:32>").append(productName).append("  ").append(number).append("</CS><BR>");
+            builder.append("<CS:32>").append(productName).append(" x ").append(number).append("</CS><BR>");
             if (StrUtil.isNotBlank(remark)) {
                 builder.append("<CS:32>").append(remark).append(" </CS><BR>");
             }
         } else {
-            builder.append("<B>").append(productName).append("  ").append(number).append("</B><BR>");
+            builder.append("<B>").append(productName).append(" x ").append(number).append("</B><BR>");
             if (StrUtil.isNotBlank(remark)) {
                 builder.append("<B>").append(remark).append(" </B><BR>");
             }