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("时间: ").append(date).append("


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