From 96791306f21c48369bf897f83348f8377e29db69 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 23 Aug 2024 14:51:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
 =?UTF-8?q?=E6=8C=82=E5=8D=95=E4=B9=8B=E5=90=8EmasterId=E6=9C=AA=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/shopimpl/TbShopTableServiceImpl.java | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index a2d4dc79..0ed1e89b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -754,10 +754,15 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 .eq(TbCashierCart::getShopId, createOrderDTO.getShopId())
                 .eq(TbCashierCart::getTableId, createOrderDTO.getTableId())
                 .in(TbCashierCart::getStatus, "create", "refund")
-                .and(query -> {
-                    query.eq(TbCashierCart::getMasterId, createOrderDTO.getMasterId())
-                            .or().
-                            isNull(TbCashierCart::getMasterId);
+                .and(query2 -> {
+                    query2.or(query3 -> {
+                                query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
+                                        .eq(TbCashierCart::getMasterId, createOrderDTO.getMasterId());
+                            })
+                            .or((query4 -> {
+                                query4.isNull(TbCashierCart::getTradeDay)
+                                        .eq(TbCashierCart::getMasterId, "");
+                            }));
                 });
 //        if (createOrderDTO.getVipUserId() != null) {
 //            queryWrapper.eq(TbCashierCart::getUserId, createOrderDTO.getVipUserId());
@@ -925,9 +930,15 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             queryWrapper.eq(TbCashierCart::getTableId, pendingDTO.getTableId())
                     .eq(TbCashierCart::getStatus, "create")
                     .eq(TbCashierCart::getTableId, pendingDTO.getTableId())
-                    .and(query -> {
-                        query.eq(TbCashierCart::getMasterId, pendingDTO.getMasterId()).or()
-                                .isNull(TbCashierCart::getMasterId);
+                    .and(query2 -> {
+                        query2.or(query3 -> {
+                                    query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
+                                            .eq(TbCashierCart::getMasterId, pendingDTO.getMasterId());
+                                })
+                                .or((query4 -> {
+                                    query4.isNull(TbCashierCart::getTradeDay)
+                                            .eq(TbCashierCart::getMasterId, "");
+                                }));
                     });
 //            if (pendingDTO.getVipUserId() != null) {
 //                queryWrapper.eq(TbCashierCart::getUserId, pendingDTO.getVipUserId());
@@ -1006,7 +1017,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
         List<TbProductSku> skuList = productSkuRepository.findAllById(skuIds);
 
-        HashMap<String, TbProductSku> skuMap = new HashMap<>();
+        LinkedHashMap<String, TbProductSku> skuMap = new LinkedHashMap<>();
         skuList.forEach(item -> {
             skuMap.put(item.getId().toString(), item);
         });