From 483af5462d2f165ffb5305f6a37987f0fde2a755 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Wed, 16 Oct 2024 14:27:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java  | 3 +++
 .../service/impl/shopimpl/TbShopTableServiceImpl.java       | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
index 9f2a4d40..1c6efc4f 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java
@@ -125,6 +125,9 @@ public class TbOrderDetail implements Serializable {
     @Column(name = "`refund_remark`")
     private String refundRemark;
 
+    @Column(name = "`return_num`")
+    private String returnNum;
+
     public void copy(TbOrderDetail source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
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 e22b06a8..b2b98366 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
@@ -747,10 +747,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 .and(q -> q.eq(TbCashierCart::getMasterId, masterId).or().isNull(TbCashierCart::getMasterId));
 
         if (!shopEatTypeInfoDTO.isTakeout()) {
-            queryWrapper.eq(TbCashierCart::getTableId, tableId)
-                    .in(TbCashierCart::getPlatformType, OrderPlatformTypeEnum.PC.getValue(), OrderPlatformTypeEnum.CASH.getValue());
+            queryWrapper.eq(TbCashierCart::getTableId, tableId);
         } else {
-            queryWrapper.and(q -> q.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""));
+            queryWrapper.and(q -> q.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""))
+                    .in(TbCashierCart::getPlatformType, OrderPlatformTypeEnum.PC.getValue(), OrderPlatformTypeEnum.CASH.getValue());
         }
 
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<TbCashierCart> cartPage = cashierCartMapper