From 95ac672597281c39a8cfd378f1cf1015ecdf72bc Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 11 Oct 2024 10:17:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/OrderService.java  | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 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 5f0ced3..7462320 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -478,26 +478,19 @@ public class OrderService {
         ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(Integer.valueOf(shopId), eatModel);
         String day = DateUtils.getDay();
 
+        String finalMasterId1 = masterId;
         LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
-                .notIn(TbCashierCart::getStatus, "final", "closed", "pending")
+                .in(TbCashierCart::getStatus, "create", "return")
+                .eq(TbCashierCart::getShopId, shopId)
                 .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
-                .eq(TbCashierCart::getShopId, shopId);
+                .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
+                .and(q -> q.eq(TbCashierCart::getMasterId, finalMasterId1).or().isNull(TbCashierCart::getMasterId));
 
-        // 普通点单
-        if (StrUtil.isBlank(tableId)) {
-            queryWrapper.eq(TbCashierCart::getMasterId, masterId)
-                    .notIn(TbCashierCart::getStatus, "refund")
-                    .eq(TbCashierCart::getTradeDay, day)
-                    .and(query -> query.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""));
-            // 台桌点单
-        } else if (StrUtil.isNotBlank(tableId)) {
-            String finalMasterId = masterId;
-            queryWrapper.eq(TbCashierCart::getTableId, tableId)
-                    .and(query -> query.eq(TbCashierCart::getMasterId, finalMasterId)
-                            .or()
-                            .isNull(TbCashierCart::getMasterId)
-                            .or()
-                            .eq(TbCashierCart::getMasterId, ""));
+        if (!shopEatTypeInfoDTO.isTakeout()) {
+            queryWrapper.eq(TbCashierCart::getTableId, tableId);
+        } else {
+            queryWrapper.and(q -> q.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""))
+                    .in(TbCashierCart::getPlatformType, OrderPlatformTypeEnum.PC.getValue(), OrderPlatformTypeEnum.CASH.getValue());
         }
 
         List<TbCashierCart> list = mpCashierCartMapper.selectList(queryWrapper);