From 182c0d3eee534f5f499d381bfc6aa6545696af23 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:28:54 +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   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 c0320eb..e125781 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
@@ -2,6 +2,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 org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.HttpEntity;
@@ -19,7 +20,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 public class FeieyunPrintUtil {
 
@@ -125,11 +125,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><BR><BR>");
+            builder.append("<B><BOLD>"+productName+"      x "+number+"</BOLD></B><BR><BR>");
+            builder.append("<B><BOLD>"+StrUtil.emptyToDefault(remark,"")+" </BOLD></B><BR><BR><BR>");
         }else {
-            builder.append("<B><BOLD>"+productName+"      "+number+"</BOLD></B><BR><BR>");
-            builder.append("<B><BOLD>"+remark+" </BOLD></B><BR><BR><BR>");
+            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("<CUT>");