From 0b68aa89d5cf806e1dd6156235efdd8154c308d3 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 12 Oct 2024 15:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/rabbit/PrintConsumer.java | 6 ++---- .../system/cashierservice/rabbit/print/PrinterHandler.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintConsumer.java index 60eee83..6e41090 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintConsumer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintConsumer.java @@ -134,7 +134,7 @@ public class PrintConsumer { } - private List getPrintMachine(Integer shopId, String subType, String model) { + private List getPrintMachine(Integer shopId, String subType, String printMethod) { TbShopInfo shopInfo = tbShopInfoMapper.selectByPrimaryKey(shopId); if (ObjectUtil.isEmpty(shopInfo)) { log.error("店铺信息不存在"); @@ -145,15 +145,13 @@ public class PrintConsumer { .eq(TbPrintMachine::getStatus, 1) .eq(TbPrintMachine::getShopId, shopId) .eq(TbPrintMachine::getSubType, subType) + .eq(TbPrintMachine::getPrintMethod, printMethod) .eq(TbPrintMachine::getConnectionType, "network")); if (list.isEmpty()) { log.error("店铺未配置打印机，店铺id: {}", shopId); return list; } - list = list.stream() - .filter(item -> StrUtil.isNotBlank(item.getPrintMethod()) - && model.equals(item.getPrintMethod())).collect(Collectors.toList()); log.info("打印机列表: {}", list); return list; diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java index a3dae45..badc58b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java @@ -64,7 +64,7 @@ public abstract class PrinterHandler { c.getId().toString().equals(categoryId) ).count(); - if (count == 0) { + if (machine.getClassifyPrint() != null && "1".equals(machine.getClassifyPrint()) && count == 0) { log.warn("分类未添加菜品: {} : {}", item.getProductName(), sku.getSpecSnap()); return; }