From c79c300e3417592ec82ea827884b1186e75c9495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 25 Nov 2025 14:49:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E5=B0=8F=E7=A5=A8=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/service/order/print/FeiPrinter.java | 4 ++-- .../main/java/com/czg/service/order/print/PrinterImpl.java | 5 ++++- .../main/java/com/czg/service/order/print/YxyPrinter.java | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) 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 2fc2f4670..9e1218e02 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 @@ -71,7 +71,7 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl { protected void normalDishesPrint(OrderInfo orderInfo, OrderDetail orderDetail, PrintMachine machine) { String remark = orderDetail.getRemark(); String content = buildDishPrintData(false, getPickupNum(orderInfo), orderInfo.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), - orderDetail.getProductName(), orderDetail.getSkuName(), orderDetail.getNum(), remark, orderDetail.getProGroupInfo()); + orderDetail.getProductName(), orderDetail.getSkuName(), orderDetail.getNum(), remark, orderDetail.getProGroupInfo(), orderDetail.getId()); Object o = sendPrintRequest(machine.getAddress(), content, null, "1"); printMachineLogService.save(machine, "新订单", content, o); @@ -83,7 +83,7 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl { protected void returnDishesPrint(OrderInfo orderInfo, OrderDetail orderDetail, PrintMachine machine) { String remark = orderDetail.getRemark(); String content = buildDishPrintData(true, getPickupNum(orderInfo), orderInfo.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), - orderDetail.getProductName(), orderDetail.getSkuName(), orderDetail.getReturnNum(), remark, orderDetail.getProGroupInfo()); + orderDetail.getProductName(), orderDetail.getSkuName(), orderDetail.getReturnNum(), remark, orderDetail.getProGroupInfo(), orderDetail.getId()); Object o = sendPrintRequest(machine.getAddress(), content, null, "1"); printMachineLogService.save(machine, "退款单", content, o); 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 065e67b60..aaaad76a7 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 @@ -383,7 +383,8 @@ public interface PrinterImpl { * @param proGroupInfo 套餐信息 * @return 元数据 */ - default String buildDishPrintData(boolean isReturn, String pickupNumber, String date, String productName, String skuName, BigDecimal number, String remark, String proGroupInfo) { + default String buildDishPrintData(boolean isReturn, String pickupNumber, String date, String productName, String skuName, + BigDecimal number, String remark, String proGroupInfo, Long orderDetailId) { PrintSignLabel signLabelInfo = getSignLabelInfo(); StringBuilder builder = new StringBuilder(); if (isReturn) { @@ -439,6 +440,8 @@ public interface PrinterImpl { // builder.append("(").append(i + 1).append(")").append(proName).append(" x ").append(qty).append("
"); } } + builder.append(getFormatLabel("UP_ORDER_DETAIL:" + orderDetailId, signLabelInfo.center, signLabelInfo.qr)) + .append(signLabelInfo.br); builder.append(signLabelInfo.br) .append(signLabelInfo.getOut(150)) .append(signLabelInfo.cut); 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 9027e4f01..9652a604a 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 @@ -114,7 +114,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl { @Override protected void normalDishesPrint(OrderInfo orderInfo, OrderDetail orderDetail, PrintMachine machine) { String buildDishPrintData = buildDishPrintData(false, getPickupNum(orderInfo), DateUtil.format(orderDetail.getCreateTime(), "yyyy-MM-dd HH:mm:ss"), orderDetail.getProductName(), orderDetail.getSkuName(), - orderDetail.getNum(), orderDetail.getRemark(), orderDetail.getProGroupInfo()); + orderDetail.getNum(), orderDetail.getRemark(), orderDetail.getProGroupInfo(), orderDetail.getId()); String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; // String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; Object resp = sendPrintRequest(machine.getAddress(), buildDishPrintData, voiceJson, "1"); @@ -126,7 +126,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl { @Override protected void returnDishesPrint(OrderInfo orderInfo, OrderDetail orderDetail, PrintMachine machine) { String buildDishPrintData = buildDishPrintData(true, getPickupNum(orderInfo), DateUtil.format(orderDetail.getCreateTime(), "yyyy-MM-dd HH:mm:ss"), orderDetail.getProductName(), orderDetail.getSkuName(), - orderDetail.getReturnNum(), orderDetail.getRemark(), orderDetail.getProGroupInfo()); + orderDetail.getReturnNum(), orderDetail.getRemark(), orderDetail.getProGroupInfo(), orderDetail.getId()); // String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; Object resp = sendPrintRequest(machine.getAddress(), buildDishPrintData, voiceJson, "1");