From 9b48d499046cd488ec591b85a26769830dd6e8bd Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 16 Apr 2026 16:14:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=95=B0=E6=8D=AE=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/mq/PrintMqListener.java | 6 +++--- .../com/czg/service/order/print/PrintConfig.java | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java index 214cc03b9..9772471e2 100644 --- a/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java +++ b/cash-api/order-server/src/main/java/com/czg/mq/PrintMqListener.java @@ -82,15 +82,15 @@ public class PrintMqListener { public void otherPrint(String data) { JSONObject jsonObject = JSONObject.parseObject(data); Long shopId = jsonObject.getLong("shopId"); - Object o = jsonObject.getObject("data", Object.class); String printTypeEnum = jsonObject.getString("printTypeEnum"); + JSONObject data2 = jsonObject.getJSONObject("data"); PrinterHandler.PrintTypeEnum typeEnum = PrinterHandler.PrintTypeEnum.valueOf(printTypeEnum); SysPrintData sysPrintData = new SysPrintData(); sysPrintData.setShopId(shopId); - sysPrintData.setData(JSONObject.toJSONString(o)); + sysPrintData.setData(data2.toJSONString()); sysPrintData.setType(typeEnum.toString()); printDataService.save(sysPrintData); rabbitPublisher.sendOtherPrintLocalMsg(shopId, printTypeEnum, sysPrintData.getId()); - printConfig.otherHandler(shopId, o, typeEnum); + printConfig.otherHandler(shopId, data2, typeEnum); } } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java index 2b7b0798d..14bad6141 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrintConfig.java @@ -176,7 +176,7 @@ public class PrintConfig implements ApplicationRunner { * @param data 传递的数据 * @param printTypeEnum IN_STOCK DAY_REPORT PRODUCT_REPORT RECHARGE STOCK_CHECK */ - public void otherHandler(Long shopId, Object data, PrinterHandler.PrintTypeEnum printTypeEnum) { + public void otherHandler(Long shopId, JSONObject data, PrinterHandler.PrintTypeEnum printTypeEnum) { if (shopId == null || Objects.isNull(data)) { log.info("otherHandler 打印数据为空, shopId: {}, data: {}", shopId, data); return; @@ -186,38 +186,38 @@ public class PrintConfig implements ApplicationRunner { case PrinterHandler.PrintTypeEnum.STOCK: getPrintMachine(shopId, printTypeEnum) .forEach(machine -> getPrinter(machine.getBrand()) - .stockPrint(machine, shopInfo.getShopName(), (StockPrintDTO) data)); + .stockPrint(machine, shopInfo.getShopName(), JSONObject.parseObject(data.toJSONString(), StockPrintDTO.class))); break; case PrinterHandler.PrintTypeEnum.DAY_REPORT: getPrintMachine(shopId, printTypeEnum) .forEach(machine -> getPrinter(machine.getBrand()) - .dayReportPrint(machine, shopInfo.getShopName(), (DayReportPrintDTO) data)); + .dayReportPrint(machine, shopInfo.getShopName(), JSONObject.parseObject(data.toJSONString(), DayReportPrintDTO.class))); break; case PrinterHandler.PrintTypeEnum.PRODUCT_REPORT: getPrintMachine(shopId, printTypeEnum) .forEach(machine -> getPrinter(machine.getBrand()) - .productReportPrint(machine, shopInfo.getShopName(), (ProductReportPrintDTO) data)); + .productReportPrint(machine, shopInfo.getShopName(), JSONObject.parseObject(data.toJSONString(), ProductReportPrintDTO.class))); break; case PrinterHandler.PrintTypeEnum.RECHARGE: getPrintMachine(shopId, printTypeEnum) .forEach(machine -> getPrinter(machine.getBrand()) - .rechargePrint(machine, shopInfo.getShopName(), (RechargePrintDTO) data)); + .rechargePrint(machine, shopInfo.getShopName(), JSONObject.parseObject(data.toJSONString(), RechargePrintDTO.class))); break; case PrinterHandler.PrintTypeEnum.STOCK_CHECK: getPrintMachine(shopId, printTypeEnum) .forEach(machine -> getPrinter(machine.getBrand()) - .stockCheckPrint(machine, shopInfo.getShopName(), (StockCheckPrintDTO) data)); + .stockCheckPrint(machine, shopInfo.getShopName(), JSONObject.parseObject(data.toJSONString(), StockCheckPrintDTO.class))); break; case PrinterHandler.PrintTypeEnum.HANDOVER: log.info("准备开始打印交班"); getPrintMachine(shopId, printTypeEnum) - .forEach(machine -> getPrinter(machine.getBrand()).handoverPrint(machine, shopInfo.getShopName(), (HandoverRecordDTO) data)); + .forEach(machine -> getPrinter(machine.getBrand()).handoverPrint(machine, shopInfo.getShopName(), JSONObject.parseObject(data.toJSONString(), HandoverRecordDTO.class))); break; case PrinterHandler.PrintTypeEnum.CALL: log.info("准备开始打印叫号单"); getPrintMachine(shopId, printTypeEnum) .forEach(machine -> getPrinter(machine.getBrand()) - .callNumPrintBefore(machine, shopInfo.getShopName(), (CallQueue) data)); + .callNumPrintBefore(machine, shopInfo.getShopName(), JSONObject.parseObject(data.toJSONString(), CallQueue.class))); break; default: throw new CzgException("otherHandler 未知打印类型");