From 9766205267adf012421c63ab5100d2d1ef520036 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 1 Apr 2025 09:40:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/service/order/print/FeiPrinter.java | 1 + .../src/main/java/com/czg/service/order/print/YxyPrinter.java | 1 + .../com/czg/service/order/service/impl/OrderInfoServiceImpl.java | 1 + 3 files changed, 3 insertions(+) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java index fe416a58e..97e912ca2 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java @@ -114,6 +114,7 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl { long count = orderInfoService.queryChain() .eq(OrderInfo::getTradeDay, orderInfo.getTradeDay()) .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()) + .eq(OrderInfo::getShopId, orderInfo.getShopId()) .le(OrderInfo::getCreateTime,orderInfo.getCreateTime()).count(); String printerNum = "1"; if (StrUtil.isNotBlank(machine.getPrintQty())) { diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java index 7ff644f81..2fc35a7b9 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java @@ -160,6 +160,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl { long count = orderInfoService.queryChain() .eq(OrderInfo::getTradeDay, orderInfo.getTradeDay()) .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()) + .eq(OrderInfo::getShopId, orderInfo.getShopId()) .le(OrderInfo::getCreateTime,orderInfo.getCreateTime()).count(); PrintInfoDTO printInfoDTO = new PrintInfoDTO().setShopName(shopInfo.getShopName()).setPrintType("普通打印").setPickupNum(getPickupNum(orderInfo)) .setOrderNo(orderInfo.getOrderNo()).setTradeDate(DateUtil.format(orderInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss")).setOperator("【POS-1】001").setPayAmount(orderInfo.getPayAmount().toPlainString()) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 29cf07d58..d7eb40622 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -164,6 +164,7 @@ public class OrderInfoServiceImpl extends ServiceImpl