diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java
index 9c84c7c64..491b2f0da 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java
@@ -48,7 +48,6 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
private final PrintSignLabel printSignLabel = new PrintSignLabel()
.setBr("
")
-
.setCut("")
.setF(new String[]{"", ""})
.setL(new String[]{"", ""})
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
index 1e6d190e2..1ece96908 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
@@ -266,7 +266,7 @@ public abstract class PrinterHandler {
item.setProductName("【临】" + item.getProductName());
}
}
- boolean isGift = item.getPackAmount().compareTo(BigDecimal.ZERO) == 0;
+ boolean isGift = item.getIsGift() != null && item.getIsGift() == 1;
if (isGift && !item.getProductName().contains("【赠】")) {
item.setProductName("【赠】" + item.getProductName());
}
@@ -335,7 +335,7 @@ public abstract class PrinterHandler {
it.setProductName("【临】%s".formatted(it.getProductName()));
}
it.setPackAmount(it.getPackAmount() == null ? BigDecimal.ZERO : it.getPackAmount());
- boolean isGift = it.getPackAmount().compareTo(BigDecimal.ZERO) == 0;
+ boolean isGift = it.getIsGift() != null && it.getIsGift() == 1;
if (isGift) {
it.setProductName("【赠】%s".formatted(it.getProductName()));
}
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
index 5284da0af..b7918091e 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
@@ -170,7 +170,8 @@ public interface PrinterImpl {
data.append(signLabelInfo.br);
// data.append("");
// data.append("
");
- data.append(getFormatLabel("品名 数量 小计", signLabelInfo.s))
+ // 18个空格 12
+ data.append(getFormatLabel("品名 数量 小计", signLabelInfo.s))
.append(signLabelInfo.br);
// data.append("品名 数量 小计
");
data.append(getFormatLabel("--------------------------------", signLabelInfo.s))
@@ -178,7 +179,8 @@ public interface PrinterImpl {
// data.append("--------------------------------
");
for (OrderDetail detail : detailList) {
String number = detail.getNum().stripTrailingZeros().toPlainString();
- String row = getRow(detail.getProductName(), "", number, toPlainStr(detail.getPayAmount().stripTrailingZeros().toPlainString()), 20, 0, 3, 6);
+ String row = getRow(detail.getProductName(), "", number,
+ toPlainStr(detail.getPayAmount().stripTrailingZeros().toPlainString()), 23, 0, 5, 4);
data.append(row);
if (StrUtil.isNotBlank(detail.getSkuName())) {
data.append(getFormatLabel(StrUtil.format("规格:{}", detail.getSkuName()), signLabelInfo.s))
@@ -301,10 +303,11 @@ public interface PrinterImpl {
// builder.append("").append(skuName).append("
");
}
} else {
- builder.append(getFormatLabel(StrUtil.format("{} x ", productName), signLabelInfo.bold));
+ builder.append(getFormatLabel(StrUtil.format("{} x {}", productName, number.stripTrailingZeros().toPlainString()), signLabelInfo.l))
+ .append(signLabelInfo.br);
// builder.append("").append(productName).append(" x ").append(number).append("
");
if (StrUtil.isNotBlank(skuName)) {
- builder.append(getFormatLabel(skuName, signLabelInfo.bold))
+ builder.append(getFormatLabel(skuName, signLabelInfo.l))
.append(signLabelInfo.br);
// builder.append("").append(skuName).append("
");
}