From 2b7ca62abff60053754a2b0d6691855e92d0480a Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Wed, 21 Aug 2024 09:21:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=8F=B0=E6=A1=8C=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OrderController.java           |  3 +--
 .../cashierservice/service/OrderService.java  | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
index c4c0a3a..fc5f101 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
@@ -55,13 +55,12 @@ public class OrderController {
                              @RequestHeader("clientType") String clientType,
                              @RequestParam(value = "masterId", required = false) String masterId,
                              @RequestParam(required = false) String tableId,
-                             @RequestParam(required = false) Integer vipUserId,
                              @RequestParam("shopId") String shopId
     ){
         if (tableId == null && StrUtil.isBlank(masterId)) {
             return Result.fail("masterId和tableId不能同时为空");
         }
-        return orderService.queryCart(masterId,shopId, vipUserId, tableId);
+        return orderService.queryCart(masterId,shopId, tableId);
     }
 
 
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 c143784..7b6685e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -354,7 +354,7 @@ public class OrderService {
         }
     }
 
-    public Result queryCart(String masterId, String shopId, Integer vipUserId, String tableId) {
+    public Result queryCart(String masterId, String shopId, String tableId) {
         if (StringUtils.isEmpty(shopId)) {
             return Result.fail(CodeEnum.SHOPINFONOEXIST);
         }
@@ -368,12 +368,13 @@ public class OrderService {
             queryWrapper.eq(TbCashierCart::getMasterId, masterId);
             queryWrapper.isNull(TbCashierCart::getTableId);
             // 台桌点单
-        }else if (StrUtil.isNotBlank(tableId) && vipUserId == null) {
+        }else if (StrUtil.isNotBlank(tableId)) {
             queryWrapper.eq(TbCashierCart::getTableId, tableId)
-                    .eq(TbCashierCart::getMasterId, masterId);
-            // 会员点单
-        }else {
-            queryWrapper.eq(TbCashierCart::getUserId, vipUserId);
+                    .and(query -> {
+                        query.eq(TbCashierCart::getMasterId, masterId)
+                                .or()
+                                .isNull(TbCashierCart::getMasterId);
+                    });
         }
 
 
@@ -496,11 +497,11 @@ public class OrderService {
             // 台桌点单
         }else if (StrUtil.isNotBlank(orderVo.getTableId()) && orderVo.getVipUserId() == null) {
             queryWrapper.eq(TbCashierCart::getTableId, orderVo.getTableId())
-                    .eq(TbCashierCart::getTradeDay, day)
-                    .eq(TbCashierCart::getMasterId, orderVo.getMasterId());
-            // 会员点单
-        }else {
-            queryWrapper.eq(TbCashierCart::getUserId, orderVo.getVipUserId());
+                    .and(query -> {
+                    query.eq(TbCashierCart::getMasterId, orderVo.getMasterId())
+                            .or()
+                            .isNull(TbCashierCart::getMasterId);
+                    });
         }
 
         List<TbCashierCart> list = mpCashierCartMapper.selectList(queryWrapper);