From ea21e97e29beb1d7d891fa5aa86126615ab480a7 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 28 Sep 2024 10:40:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=AE=80=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/entity/TbOrderDetail.java | 2 + .../rabbit/PrintMechineConsumer.java | 13 ++++--- .../rabbit/print/YxyPrinter.java | 24 ++++++++---- .../service/CloudPrinterService.java | 6 ++- .../cashierservice/util/PrinterUtils.java | 37 +++++++++---------- 5 files changed, 47 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java index cf791b0..00238d5 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java @@ -45,5 +45,7 @@ public class TbOrderDetail implements Serializable { private Integer placeNum; private String useType; + private String note; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java index 616eb0d..9f54982 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java @@ -341,14 +341,14 @@ public class PrintMechineConsumer { data = PrinterUtils.getPrintData("return", StrUtil.isBlank(orderInfo.getTableName()) ? orderInfo.getMasterId() : orderInfo.getTableName(), - DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getProductName(), Math.abs(printerNum), remark); + DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getProductName(), Math.abs(printerNum), remark, null); voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}"; PrinterUtils.printTickets(voiceJson, 3, 1, tbPrintMachineWithBLOBs.getAddress(), data); } else { data = PrinterUtils.getPrintData("", orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getProductName(), - printerNum, remark); + printerNum, remark, null); voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; PrinterUtils.printTickets(voiceJson, 3, 1, tbPrintMachineWithBLOBs.getAddress(), data); @@ -366,7 +366,7 @@ public class PrintMechineConsumer { TbOrderDetail orderDetail = (TbOrderDetail) item; String data = PrinterUtils.getPrintData("return", StrUtil.isBlank(orderInfo.getTableName()) ? orderInfo.getMasterId() : orderInfo.getTableName(), - DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), orderDetail.getNum(), orderDetail.getRemark()); + DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), orderDetail.getNum(), orderDetail.getRemark(), null); String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}"; PrinterUtils.printTickets(voiceJson, 3, 1, tbPrintMachineWithBLOBs.getAddress(), data); @@ -436,7 +436,7 @@ public class PrintMechineConsumer { TbOrderDetail orderDetail = (TbOrderDetail) item; String data = PrinterUtils.getPrintData("return", StrUtil.isBlank(orderInfo.getTableName()) ? orderInfo.getMasterId() : orderInfo.getTableName(), - DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), orderDetail.getNum(), orderDetail.getRemark()); + DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), orderDetail.getNum(), orderDetail.getRemark(), null); String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}"; PrinterUtils.printTickets(voiceJson, 3, 1, machine.getAddress(), data); @@ -478,7 +478,7 @@ public class PrintMechineConsumer { } String data = PrinterUtils.getPrintData("", orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getProductName(), - it.getNum(), remark); + it.getNum(), remark, null); String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; PrinterUtils.printTickets(voiceJson, 3, 1, tbPrintMachineWithBLOBs.getAddress(), data); } @@ -506,7 +506,8 @@ public class PrintMechineConsumer { if (ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs) && ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs.getSpecSnap())) { remark = tbProductSkuWithBLOBs.getSpecSnap(); } - String data = PrinterUtils.getPrintData("return", orderInfo.getPayType().equals("wx_lite") ? orderInfo.getTableName() : orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getProductName(), it.getNum(), remark); + String data = PrinterUtils.getPrintData("return", orderInfo.getPayType().equals("wx_lite") ? + orderInfo.getTableName() : orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getProductName(), it.getNum(), remark, null); String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}"; PrinterUtils.printTickets(voiceJson, 3, 1, tbPrintMachineWithBLOBs.getAddress(), data); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java index 2f90d92..a423b24 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java @@ -1,5 +1,6 @@ package com.chaozhanggui.system.cashierservice.rabbit.print; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -44,8 +45,10 @@ public class YxyPrinter extends PrinterHandler{ protected void returnDishesPrint(TbOrderInfo orderInfo, TbOrderDetail orderDetail, TbPrintMachine machine) { String data = PrinterUtils.getPrintData("return", StrUtil.isBlank(orderInfo.getTableName()) ? orderInfo.getMasterId() : orderInfo.getTableName(), - DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), Math.abs(orderDetail.getNum()), orderDetail.getRemark()); - String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}"; + DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), + Math.abs(orderDetail.getNum()), orderDetail.getRemark(), orderDetail.getNote()); +// String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}"; + String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; PrinterUtils.printTickets(voiceJson, 3, 1, machine.getAddress(), data); } @@ -53,8 +56,9 @@ public class YxyPrinter extends PrinterHandler{ protected void normalDishesPrint(TbOrderInfo orderInfo, TbOrderDetail orderDetail, TbPrintMachine machine) { String data = PrinterUtils.getPrintData("", orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), - orderDetail.getNum(), orderDetail.getRemark()); - String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; + orderDetail.getNum(), orderDetail.getRemark(), orderDetail.getNote()); +// String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; + String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; PrinterUtils.printTickets(voiceJson, 3, 1, machine.getAddress(), data); } @@ -71,7 +75,8 @@ public class YxyPrinter extends PrinterHandler{ String printType = "退款单"; String data = PrinterUtils.getCashPrintData(detailPO, printType, "return"); - String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; +// String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; + String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; PrinterUtils.printTickets(voiceJson, 1, 1, machine.getAddress(), data); } @@ -89,7 +94,8 @@ public class YxyPrinter extends PrinterHandler{ detailPO.setOutNumber(orderInfo.getOutNumber()); String printType = "结算单"; String data = PrinterUtils.getCashPrintData(detailPO, printType, orderInfo.getOrderType()); - String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; +// String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; + String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; PrinterUtils.printTickets(voiceJson, 3, 1, machine.getAddress(), data); } @@ -123,6 +129,10 @@ public class YxyPrinter extends PrinterHandler{ } public static void main(String[] args) { - + String data = PrinterUtils.getPrintData("", "#3", + DateUtils.getTime(DateUtil.date()), "九度", + Integer.valueOf("20"), "少冰", "加菜防守打法火速地方啊地上1三大法宝苏俄倒海翻江"); + String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; + PrinterUtils.printTickets(voiceJson, 3, 1, "ZF544PG03W00005", data); } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java index 21fa5da..3cf7811 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java @@ -309,7 +309,8 @@ public class CloudPrinterService { if (ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs) && ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs.getSpecSnap())) { remark = tbProductSkuWithBLOBs.getSpecSnap(); } - String data = PrinterUtils.getPrintData("return",orderInfo.getPayType().equals("wx_lite")?orderInfo.getTableName():orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getProductName(), it.getNum(), remark); + String data = PrinterUtils.getPrintData("return",orderInfo.getPayType().equals("wx_lite") ? + orderInfo.getTableName():orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getProductName(), it.getNum(), remark, null); String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}"; PrinterUtils.printTickets(voiceJson,3, Integer.valueOf(printerNum), tbPrintMachineWithBLOBs.getAddress(), data); } @@ -345,7 +346,8 @@ public class CloudPrinterService { - String data = PrinterUtils.getPrintData("",orderInfo.getOrderType().equals("miniapp")?orderInfo.getTableName():orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark); + String data = PrinterUtils.getPrintData("",orderInfo.getOrderType().equals("miniapp") ? + orderInfo.getTableName():orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark, null); String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; PrinterUtils.printTickets(voiceJson,3, Integer.valueOf(printerNum), tbPrintMachineWithBLOBs.getAddress(), data); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java index a16b2f9..8560aa6 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java @@ -66,38 +66,35 @@ public class PrinterUtils { return finalMap; } - /** - * 厨房打印机 - * - * @param pickupNumber - * @param date - * @param productName - * @param number - * @param remark - * @return + * 菜品票打印 + * @param type 是否退菜单 + * @param pickupNumber 取餐号 + * @param date 时间 + * @param productName 商品名 + * @param number 数量 + * @param remark sku规格名 + * @param note 备注 */ - public static String getPrintData(String type, String pickupNumber, String date, String productName, Integer number, String remark) { + public static String getPrintData(String type, String pickupNumber, String date, String productName, Integer number, String remark, String note) { StringBuilder builder = new StringBuilder(); if ("return".equals(type)) { - builder.append("" + pickupNumber + "【退】

"); + builder.append("").append(pickupNumber).append("【退】

"); } else { - builder.append("" + pickupNumber + "

"); + builder.append("").append(pickupNumber).append("

"); } - - - builder.append("时间: " + date + "


"); + builder.append("时间: ").append(date).append("


"); if (productName.length() > 4 || remark.length() > 4) { - builder.append("" + productName + " " + number + "
"); - builder.append("" + remark + "
"); + builder.append("").append(productName).append(" ").append(number).append("
"); + builder.append("").append(remark).append("
"); } else { - builder.append("" + productName + " " + number + "
"); - builder.append("" + remark + "
"); + builder.append("").append(productName).append(" ").append(number).append("
"); + builder.append("").append(remark).append("
"); } + builder.append("备注: ").append(note == null ? "" : note).append("
"); builder.append(""); builder.append(""); - return builder.toString(); }