diff --git a/cash-common/cash-common-service/src/main/java/com/czg/print/RechargePrintDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/print/RechargePrintDTO.java index e53ab3733..9775327d9 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/print/RechargePrintDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/print/RechargePrintDTO.java @@ -37,7 +37,7 @@ public class RechargePrintDTO implements Serializable { //充值后余额 private BigDecimal balance; //已付金额 - private BigDecimal payAmount; +// private BigDecimal payAmount; //支付方式 private String payType; //操作员 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 b96e91653..40ccab7f0 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 @@ -465,7 +465,7 @@ public interface PrinterImpl { StringBuilder builder = new StringBuilder(); builder.append(getFormatLabel(pickupNumber, signLabelInfo.centerBold)) .append(signLabelInfo.br); - builder.append(getFormatLabel(StrUtil.format("时间: {}", DateUtil.format(orderDetail.getCreateTime(), "yyyy-MM-dd HH:mm:ss")), signLabelInfo.f, signLabelInfo.center)) + builder.append(getFormatLabel(StrUtil.format("时间:{}", DateUtil.format(orderDetail.getCreateTime(), "yyyy-MM-dd HH:mm:ss")), signLabelInfo.f, signLabelInfo.center)) .append(signLabelInfo.br); Integer isWaitCall = ObjectUtil.defaultIfNull(orderDetail.getIsWaitCall(), 0); if (isWaitCall == 1) { @@ -725,7 +725,7 @@ public interface PrinterImpl { builder.append(getFormatLabel(leftRightAlign(" 充值后余额:", record.getBalance().stripTrailingZeros().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br); builder.append(getFormatLabel("--------------------------------")).append(signLabelInfo.br); // 支付信息 - builder.append(getFormatLabel(leftRightAlign("已付金额:", record.getPayAmount().stripTrailingZeros().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br); + builder.append(getFormatLabel(leftRightAlign("已付金额:", record.getRechargeAmount().stripTrailingZeros().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br); builder.append(getFormatLabel(leftRightAlign("支付方式:", record.getPayType(), 32), signLabelInfo.s)).append(signLabelInfo.br); builder.append(getFormatLabel("--------------------------------")).append(signLabelInfo.br); builder.append(getFormatLabel(StrUtil.format("操作员: {}", record.getOperator()), signLabelInfo.s)).append(signLabelInfo.br);