diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java index 7df1c663..28a992e5 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java @@ -149,8 +149,18 @@ public abstract class PrinterHandler { .eq(PrintMachine::getShopId, shopId) .eq(PrintMachine::getSubType, subType) .eq(PrintMachine::getConnectionType, "网络"); + if (StrUtil.isNotEmpty(printMethod)) { - wrapper.in(PrintMachine::getPrintMethod, Arrays.asList(printMethod, "all")); + if ("one".equals(printMethod)) { + wrapper.in(PrintMachine::getPrintMethod, Arrays.asList("one", "all")); + } + if ("all".equals(printMethod)) { + wrapper.in(PrintMachine::getPrintMethod, Arrays.asList("one", "normal", "all")); + } + + if ("normal".equals(printMethod)) { + wrapper.in(PrintMachine::getPrintMethod, Arrays.asList("normal", "all")); + } } if ("callTicket".equals(printType)) { printType = "queue";