czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
Tankaikai
2024-11-04 13:59:35 +08:00
parent d783ac93d0 79601b6877
commit 81941984b6
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/YxyPrinter.java
View File

@@ -66,8 +66,8 @@ public class YxyPrinter extends PrinterHandler {
String data = PrinterUtils.getPrintData("return", getPickupNum(orderInfo), String data = PrinterUtils.getPrintData("return", getPickupNum(orderInfo),
DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(),
Math.abs(orderDetail.getNum()), orderDetail.getRemark(), orderDetail.getNote()); 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); String resp = PrinterUtils.printTickets(voiceJson, 3, 1, machine.getAddress(), data);
shopPrintLogService.save(machine, "退款单", data, resp); shopPrintLogService.save(machine, "退款单", data, resp);
} }
@@ -77,8 +77,8 @@ public class YxyPrinter extends PrinterHandler {
String data = PrinterUtils.getPrintData("", getPickupNum(orderInfo), String data = PrinterUtils.getPrintData("", getPickupNum(orderInfo),
DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(),
orderDetail.getNum(), orderDetail.getRemark(), orderDetail.getNote()); 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); String resp = PrinterUtils.printTickets(voiceJson, 3, 1, machine.getAddress(), data);
shopPrintLogService.save(machine, "新订单", data, resp); shopPrintLogService.save(machine, "新订单", data, resp);
} }
@@ -94,8 +94,8 @@ public class YxyPrinter extends PrinterHandler {
String printType = "退款单"; String printType = "退款单";
String data = PrinterUtils.getCashPrintData(detailPO, printType, "return"); 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); String resp = PrinterUtils.printTickets(voiceJson, 1, 1, machine.getAddress(), data);
shopPrintLogService.save(machine, printType, data, resp); shopPrintLogService.save(machine, printType, data, resp);
} }
@@ -114,8 +114,8 @@ public class YxyPrinter extends PrinterHandler {
detailPO.setOutNumber(orderInfo.getOutNumber()); detailPO.setOutNumber(orderInfo.getOutNumber());
String printType = "结算单"; String printType = "结算单";
String data = PrinterUtils.getCashPrintData(detailPO, printType, orderInfo.getOrderType()); 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"; String printerNum = "1";
if (StrUtil.isNotBlank(machine.getPrintQty())) { if (StrUtil.isNotBlank(machine.getPrintQty())) {
printerNum = machine.getPrintQty().split("\\^")[1]; printerNum = machine.getPrintQty().split("\\^")[1];

4
src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
View File

@@ -132,7 +132,7 @@ public class FeieyunPrintUtil {
builder.append("<B><BOLD>" + productName + " x " + number + "</BOLD></B><BR><BR>"); builder.append("<B><BOLD>" + productName + " x " + number + "</BOLD></B><BR><BR>");
builder.append("<B><BOLD>" + remark + " </BOLD></B><BR>"); builder.append("<B><BOLD>" + remark + " </BOLD></B><BR>");
} }
builder.append("<CUT>"); //builder.append("<CUT>");
return builder.toString(); return builder.toString();
} }
@@ -552,4 +552,6 @@ public class FeieyunPrintUtil {
} }
} }