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 16ce68bd..c353d5e6 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 @@ -51,12 +51,13 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl { private final PrintSignLabel printSignLabel = new PrintSignLabel() .setBr("
") .setCut("") + .setCenterBold(new String[]{"", ""}) .setF(new String[]{"", ""}) .setL(new String[]{"", ""}) .setS(new String[]{"", ""}) .setF(new String[]{"", ""}) .setQr(new String[]{"", ""}) - .setCenter(new String[]{"", ""}) + .setCenter(new String[]{"", ""}) .setBold(new String[]{"", ""}); @Override 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 23256a0a..3a412280 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 @@ -237,11 +237,10 @@ public interface PrinterImpl { data.append(getFormatLabel(printInfoDTO.getShopName(), signLabelInfo.center, signLabelInfo.f)).append(signLabelInfo.br); // data.append(StrUtil.format("{}
", printInfoDTO.getShopName())); // data.append("
"); - data.append(signLabelInfo.br); // data.append(""); - data.append(getFormatLabel(StrUtil.format("{}【{}】", printInfoDTO.getPrintTitle(), printInfoDTO.getPickupNum()), signLabelInfo.center, signLabelInfo.bold)) - .append(signLabelInfo.br) + data.append(getFormatLabel(StrUtil.format("{}【{}】", printInfoDTO.getPrintTitle(), printInfoDTO.getPickupNum()), signLabelInfo.l, signLabelInfo.center)) .append(signLabelInfo.br); + // data.append(StrUtil.format("{}【{}】
", printInfoDTO.getPrintTitle(), printInfoDTO.getPickupNum())); //if (Objects.nonNull(printInfoDTO.getOutNumber())) { // data.append(StrUtil.format("{}",printInfoDTO.getOutNumber())); @@ -375,34 +374,34 @@ public interface PrinterImpl { PrintSignLabel signLabelInfo = getSignLabelInfo(); StringBuilder builder = new StringBuilder(); if (isReturn) { - builder.append(getFormatLabel(StrUtil.format("{}【退】", pickupNumber), signLabelInfo.center, signLabelInfo.bold)) + builder.append(getFormatLabel(StrUtil.format("{}【退】", pickupNumber), signLabelInfo.centerBold)) .append(signLabelInfo.br) .append(signLabelInfo.br); // builder.append("").append(pickupNumber).append("【退】

"); } else { - builder.append(getFormatLabel(pickupNumber, signLabelInfo.center, signLabelInfo.bold)) + builder.append(getFormatLabel(pickupNumber, signLabelInfo.centerBold)) .append(signLabelInfo.br) .append(signLabelInfo.br); // builder.append("").append(pickupNumber).append("

"); } - builder.append(getFormatLabel(StrUtil.format("时间: {}", date), signLabelInfo.l, signLabelInfo.s)) + builder.append(getFormatLabel(StrUtil.format("时间: {}", date), signLabelInfo.l, signLabelInfo.center)) .append(signLabelInfo.br) .append(signLabelInfo.br); // builder.append("时间: ").append(date).append("


"); if (productName.length() > 4) { - builder.append(getFormatLabel(StrUtil.format("{} x {}", productName, number.stripTrailingZeros().toPlainString()), signLabelInfo.l, signLabelInfo.f)) + builder.append(getFormatLabel(StrUtil.format("{} x {}", productName, number.stripTrailingZeros().toPlainString()), signLabelInfo.l, signLabelInfo.f, signLabelInfo.center)) .append(signLabelInfo.br); // builder.append("").append(productName).append(" x ").append(number).append("
"); if (StrUtil.isNotBlank(skuName)) { - builder.append(getFormatLabel("(" + skuName + ")", signLabelInfo.l)).append(signLabelInfo.br); + builder.append(getFormatLabel("(" + skuName + ")", signLabelInfo.l, signLabelInfo.f, signLabelInfo.center)).append(signLabelInfo.br); // builder.append("").append(skuName).append("
"); } } else { - builder.append(getFormatLabel(StrUtil.format("{} x {}", productName, number.stripTrailingZeros().toPlainString()), signLabelInfo.l, signLabelInfo.f)) + builder.append(getFormatLabel(StrUtil.format("{} x {}", productName, number.stripTrailingZeros().toPlainString()), signLabelInfo.l, signLabelInfo.f, signLabelInfo.center)) .append(signLabelInfo.br); // builder.append("").append(productName).append(" x ").append(number).append("
"); if (StrUtil.isNotBlank(skuName)) { - builder.append(getFormatLabel("(" + skuName + ")", signLabelInfo.l, signLabelInfo.bold)) + builder.append(getFormatLabel("(" + skuName + ")", signLabelInfo.l, signLabelInfo.f, signLabelInfo.center)) .append(signLabelInfo.br); // builder.append("").append(skuName).append("
"); } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java index 65d75a9f..ae780d57 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java @@ -61,6 +61,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl { .setS(new String[]{"", ""}) .setQr(new String[]{"", ""}) .setCenter(new String[]{"", ""}) + .setCenterBold(new String[]{"", ""}) .setRs("RS") .setBold(new String[]{"", ""});