From 3303b9277aeb7667eca1d6dc81ced5f252449b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Tue, 15 Oct 2024 10:24:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/util/FeieyunPrintUtil.java       |  6 +++---
 .../system/cashierservice/util/PrinterUtils.java    | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
index e125781..fd532be 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
@@ -123,13 +123,13 @@ public class FeieyunPrintUtil {
 
         builder.append("<CB>"+pickupNumber+"</CB><BR><BR>");
         builder.append("<L>时间: "+date+" </L><BR><BR><BR>");
-
+        remark = StrUtil.emptyToDefault(remark, "");
         if(productName.length()>4||remark.length()>4){
             builder.append("<B><BOLD>"+productName+"      x "+number+"</BOLD></B><BR><BR>");
-            builder.append("<B><BOLD>"+StrUtil.emptyToDefault(remark,"")+" </BOLD></B><BR><BR><BR>");
+            builder.append("<B><BOLD>"+remark+" </BOLD></B><BR><BR><BR>");
         }else {
             builder.append("<B><BOLD>"+productName+"      x "+number+"</BOLD></B><BR><BR>");
-            builder.append("<B><BOLD>"+StrUtil.emptyToDefault(remark,"")+" </BOLD></B><BR><BR><BR>");
+            builder.append("<B><BOLD>"+remark+" </BOLD></B><BR><BR><BR>");
         }
 
 //        builder.append("<CUT>");
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 7f438c6..25ae0f2 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
@@ -1,6 +1,7 @@
 package com.chaozhanggui.system.cashierservice.util;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.chaozhanggui.system.cashierservice.model.OrderDetailPO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
@@ -71,12 +72,12 @@ public class PrinterUtils {
         StringBuilder builder = new StringBuilder();
         builder.append("<C><B>"+pickupNumber+"</B></C><BR><BR>");
         builder.append("<S><L>时间: "+date+" </L></S><BR><BR><BR>");
-
+        remark = StrUtil.emptyToDefault(remark, "");
         if(productName.length()>4||remark.length()>4){
-            builder.append("<CS:32>"+productName+"  "+number+"</CS><BR>");
+            builder.append("<CS:32>"+productName+"  x "+number+"</CS><BR>");
             builder.append("<CS:32>"+remark+" </CS><BR>");
         }else {
-            builder.append("<B>"+productName+"  "+number+"</B><BR>");
+            builder.append("<B>"+productName+"  x "+number+"</B><BR>");
             builder.append("<B>"+remark+" </B><BR>");
         }
         builder.append("<OUT:150>");
@@ -105,12 +106,12 @@ public class PrinterUtils {
 
 
         builder.append("<S><L>时间: " + date + " </L></S><BR><BR><BR>");
-
+        remark = StrUtil.emptyToDefault(remark, "");
         if (productName.length() > 4 || remark.length() > 4) {
-            builder.append("<CS:32>" + productName + "  " + number + "</CS><BR>");
+            builder.append("<CS:32>" + productName + "  x " + number + "</CS><BR>");
             builder.append("<CS:32>" + remark + " </CS><BR>");
         } else {
-            builder.append("<B>" + productName + "  " + number + "</B><BR>");
+            builder.append("<B>" + productName + "  x " + number + "</B><BR>");
             builder.append("<B>" + remark + " </B><BR>");
         }
         builder.append("<OUT:150>");