From f0ebdd9b55e870f5811b48d232ca1148dd029509 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 1 Nov 2024 15:59:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=94=BE=E5=BC=80=E6=89=93=E7=A5=A8?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/rabbit/print/YxyPrinter.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 ac8e42b..55ad0d1 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 @@ -66,8 +66,8 @@ public class YxyPrinter extends PrinterHandler { String data = PrinterUtils.getPrintData("return", getPickupNum(orderInfo), 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\":\"\"}"; + String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}"; +// String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; String resp = PrinterUtils.printTickets(voiceJson, 3, 1, machine.getAddress(), data); shopPrintLogService.save(machine, "退款单", data, resp); } @@ -77,8 +77,8 @@ public class YxyPrinter extends PrinterHandler { String data = PrinterUtils.getPrintData("", getPickupNum(orderInfo), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), orderDetail.getNum(), orderDetail.getRemark(), orderDetail.getNote()); -// String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; - String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; + String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}"; +// String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; String resp = PrinterUtils.printTickets(voiceJson, 3, 1, machine.getAddress(), data); shopPrintLogService.save(machine, "新订单", data, resp); } @@ -94,8 +94,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\":\"您有一笔新的订单，请及时处理\"}"; +// String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; String resp = PrinterUtils.printTickets(voiceJson, 1, 1, machine.getAddress(), data); shopPrintLogService.save(machine, printType, data, resp); } @@ -114,8 +114,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\":\"您有一笔新的订单，请及时处理\"}"; +// String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}"; String printerNum = "1"; if (StrUtil.isNotBlank(machine.getPrintQty())) { printerNum = machine.getPrintQty().split("\\^")[1]; From 79601b6877147ab78d92daa82f586a9e996c2997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Mon, 4 Nov 2024 13:58:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A3=9E=E8=9B=BE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E5=88=87=E5=88=80bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/util/FeieyunPrintUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java index ba8c91c..9aa3d32 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java @@ -132,7 +132,7 @@ public class FeieyunPrintUtil { builder.append("" + productName + " x " + number + "

"); builder.append("" + remark + "
"); } - builder.append(""); + //builder.append(""); return builder.toString(); } @@ -552,4 +552,6 @@ public class FeieyunPrintUtil { } + + }