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 fe416a58..97e912ca 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 7ff644f8..2fc35a7b 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 29cf07d5..d7eb4062 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