From 8d54e4971cb0bb38da68f6a5136f8c072de0dc83 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 09:29:33 +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

---
 .../system/cashierservice/util/FeieyunPrintUtil.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 4dde3a0..d637029 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
@@ -3,6 +3,7 @@ package com.chaozhanggui.system.cashierservice.util;
 
 import cn.hutool.core.text.UnicodeUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
@@ -119,11 +120,11 @@ public class FeieyunPrintUtil {
         builder.append("<L>时间: " + date + " </L><BR><BR><BR>");
 
         if (productName.length() > 4 || remark.length() > 4) {
-            builder.append("<B><BOLD>" + productName + "      " + number + "</BOLD></B><BR><BR>");
-            builder.append("<B><BOLD>" + remark + " </BOLD></B><BR>");
+            builder.append("<B><BOLD>" + productName + "      x " + number + "</BOLD></B><BR><BR>");
+            builder.append("<B><BOLD>" + StrUtil.emptyToDefault(remark,"") + " </BOLD></B><BR>");
         } else {
-            builder.append("<B><BOLD>" + productName + "      " + number + "</BOLD></B><BR><BR>");
-            builder.append("<B><BOLD>" + remark + " </BOLD></B><BR>");
+            builder.append("<B><BOLD>" + productName + "      x " + number + "</BOLD></B><BR><BR>");
+            builder.append("<B><BOLD>" + StrUtil.emptyToDefault(remark,"") + " </BOLD></B><BR>");
         }