From ce6cd6b3da82a280cf1b6b4b5f4b230d4743eeb3 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 30 Sep 2025 15:10:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A4=90=E4=BD=8D=E8=B4=B9=20=E6=89=93?= =?UTF-8?q?=E5=8C=85=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/service/order/print/FeiPrinter.java | 8 ++++++++ .../com/czg/service/order/print/PrinterHandler.java | 3 +++ .../java/com/czg/service/order/print/PrinterImpl.java | 10 ++++++++++ .../java/com/czg/service/order/print/YxyPrinter.java | 9 +++++++++ 4 files changed, 30 insertions(+) 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 e16813186..2fc2f4670 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 @@ -22,6 +22,7 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; @@ -133,6 +134,13 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl { .setRemark(orderInfo.getRemark()) .setDiscountAmount((orderInfo.getOriginAmount().add(orderInfo.getSeatAmount()).add(orderInfo.getPackFee()).subtract(orderInfo.getPayAmount())).toPlainString()); printInfoDTO.setPrintTitle(printInfoDTO.getPrintTitle()); + if(orderInfo.getSeatNum() != null && orderInfo.getSeatAmount().compareTo(BigDecimal.ZERO) > 0){ + printInfoDTO.setSeatNum(orderInfo.getSeatNum().toString()); + printInfoDTO.setSeatAmount(orderInfo.getSeatAmount().toPlainString()); + } + if(orderInfo.getPackFee().compareTo(BigDecimal.ZERO) > 0){ + printInfoDTO.setPackFee(orderInfo.getPackFee().toPlainString()); + } String string = buildOrderPrintData(printInfoDTO, detailList); Object resp = sendPrintRequest(machine.getAddress(), string, null, printerNum); 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 b376229c4..15edee962 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 @@ -127,6 +127,9 @@ public abstract class PrinterHandler { private String discountAmount; private String discountRadio; private String orderNum; + private String seatNum; + private String seatAmount; + private String packFee; // 是否退款单 private boolean isReturn; 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 73b2bb52a..e837c94ab 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 @@ -298,6 +298,16 @@ public interface PrinterImpl { }); } } + if(StrUtil.isNotBlank(printInfoDTO.getSeatAmount())){ + String row = getRow("餐位费", "", StrUtil.format("{}{}", printInfoDTO.getSeatNum(), printInfoDTO.getSeatAmount()), + toPlainStr(printInfoDTO.getSeatAmount()), 21, 0, 5, 6); + data.append(row); + } + if(StrUtil.isNotBlank(printInfoDTO.getPackFee())){ + String row = getRow("打包费", "", StrUtil.format("{}{}", "", printInfoDTO.getPackFee()), + toPlainStr(printInfoDTO.getPackFee()), 21, 0, 5, 6); + data.append(row); + } if (ObjectUtil.isNotNull(printInfoDTO.getDiscountAmount())) { data.append(getFormatLabel("--------------------------------", signLabelInfo.s)) .append(signLabelInfo.br); 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 14b17c164..9027e4f01 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 @@ -23,6 +23,7 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; @@ -172,6 +173,14 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl { .setRemark(orderInfo.getRemark()) .setDiscountAmount((orderInfo.getOriginAmount().add(orderInfo.getSeatAmount()).add(orderInfo.getPackFee()).subtract(orderInfo.getPayAmount())).toPlainString()); printInfoDTO.setPrintTitle(printInfoDTO.getPrintTitle()); + if(orderInfo.getSeatNum() != null && orderInfo.getSeatAmount().compareTo(BigDecimal.ZERO) > 0){ + printInfoDTO.setSeatNum(orderInfo.getSeatNum().toString()); + printInfoDTO.setSeatAmount(orderInfo.getSeatAmount().toPlainString()); + } + if(orderInfo.getPackFee().compareTo(BigDecimal.ZERO) > 0){ + printInfoDTO.setPackFee(orderInfo.getPackFee().toPlainString()); + } + String data = buildOrderPrintData(printInfoDTO, detailList); String voiceJson = "{\"PbizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; // String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}";