From 040db99d86ea0f95bdd905a3a9b998253cbbd35c Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Mon, 2 Sep 2024 10:32:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=89=93=E7=A5=A8=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rabbit/PrintMechineConsumer.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 5d07918..ede1b0d 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java @@ -276,10 +276,11 @@ public class PrintMechineConsumer { } private void printTicket(Integer orderId, List categoryInfos, TbPrintMachineWithBLOBs tbPrintMachineWithBLOBs, TbOrderInfo orderInfo) { + String printKey = RedisCst.ORDER_PRINT_PRO + orderId; + AtomicReference> printProductSet = new AtomicReference<>(redisTemplate.opsForSet().members(printKey)); List tbOrderDetails = tbOrderDetailMapper.selectAllByOrderId(orderId); if (!tbOrderDetails.isEmpty()) { - String printKey = RedisCst.ORDER_PRINT_PRO + orderId; - AtomicReference> printProductSet = new AtomicReference<>(redisTemplate.opsForSet().members(printKey)); + // 重置打印数据 redisTemplate.delete(printKey); tbOrderDetails.forEach(it -> { @@ -355,24 +356,23 @@ public class PrintMechineConsumer { } }); + } - // 已删除的商品打印退款信息 - if (printProductSet.get() != null) { - printProductSet.get().forEach(item -> { - log.info("已删除订单，打印退款票据, {}", item); - 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()); - String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}"; - PrinterUtils.printTickets(voiceJson, 3, 1, tbPrintMachineWithBLOBs.getAddress(), data); - - String key = RedisCst.ORDER_PRINT + orderId + ":" + orderDetail.getProductId() + ":" + orderDetail.getProductSkuId(); - log.info("删除商品数量记录key, {}", key); - redisUtils.deleteByKey(key); - }); - } + // 已删除的商品打印退款信息 + if (printProductSet.get() != null) { + printProductSet.get().forEach(item -> { + log.info("已删除订单，打印退款票据, {}", item); + 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()); + String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔退款订单，请及时处理\"}"; + PrinterUtils.printTickets(voiceJson, 3, 1, tbPrintMachineWithBLOBs.getAddress(), data); + String key = RedisCst.ORDER_PRINT + orderId + ":" + orderDetail.getProductId() + ":" + orderDetail.getProductSkuId(); + log.info("删除商品数量记录key, {}", key); + redisUtils.deleteByKey(key); + }); } }