From 4a8d85f82b98f97dc09335b7e679aab8e20de437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 29 Nov 2024 11:32:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B8=85=E7=A9=BA=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index de43a2a..b7e497f 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -1335,6 +1335,7 @@ public class OrderService {
         LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
                 .eq(TbCashierCart::getShopId, cartVo.getShopId())
                 .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
+                .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
                 .eq(TbCashierCart::getStatus, "create");
 
         if (shopEatTypeInfoDTO.isDineInAfter()) {
@@ -1344,7 +1345,6 @@ public class OrderService {
         // 普通点单
         if (StrUtil.isBlank(cartVo.getTableId())) {
             queryWrapper.eq(TbCashierCart::getMasterId, cartVo.getMasterId())
-                    .eq(TbCashierCart::getTradeDay, day)
                     .and(query -> query.isNull(TbCashierCart::getTableId)
                             .or()
                             .eq(TbCashierCart::getTableId, ""));
@@ -1404,7 +1404,9 @@ public class OrderService {
         // 打印退款票据
         int finalOrderId = orderId;
         ThreadUtil.execute(() -> {
-            printMechineConsumer.printReturnTicket(finalOrderId, null);
+            if (finalOrderId != 0) {
+                printMechineConsumer.printReturnTicket(finalOrderId, null);
+            }
         });