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]; 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 { } + + }