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(""+pickupNumber+"

"); builder.append("时间: "+date+"


"); - + remark = StrUtil.emptyToDefault(remark, ""); if(productName.length()>4||remark.length()>4){ builder.append(""+productName+" x "+number+"

"); - builder.append(""+StrUtil.emptyToDefault(remark,"")+"


"); + builder.append(""+remark+"


"); }else { builder.append(""+productName+" x "+number+"

"); - builder.append(""+StrUtil.emptyToDefault(remark,"")+"


"); + builder.append(""+remark+"


"); } // builder.append(""); 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(""+pickupNumber+"

"); builder.append("时间: "+date+"


"); - + remark = StrUtil.emptyToDefault(remark, ""); if(productName.length()>4||remark.length()>4){ - builder.append(""+productName+" "+number+"
"); + builder.append(""+productName+" x "+number+"
"); builder.append(""+remark+"
"); }else { - builder.append(""+productName+" "+number+"
"); + builder.append(""+productName+" x "+number+"
"); builder.append(""+remark+"
"); } builder.append(""); @@ -105,12 +106,12 @@ public class PrinterUtils { builder.append("时间: " + date + "


"); - + remark = StrUtil.emptyToDefault(remark, ""); if (productName.length() > 4 || remark.length() > 4) { - builder.append("" + productName + " " + number + "
"); + builder.append("" + productName + " x " + number + "
"); builder.append("" + remark + "
"); } else { - builder.append("" + productName + " " + number + "
"); + builder.append("" + productName + " x " + number + "
"); builder.append("" + remark + "
"); } builder.append("");