From 8f4e56f889c5c46ed9ac1268d02b7ee0a600df1b Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 26 Aug 2024 11:28:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?=
 =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E6=9C=80=E6=96=B0=E8=AE=A2=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/TbShopTableMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/TbShopTableMapper.xml b/src/main/resources/mapper/TbShopTableMapper.xml
index 9fadb95..5b5b16c 100644
--- a/src/main/resources/mapper/TbShopTableMapper.xml
+++ b/src/main/resources/mapper/TbShopTableMapper.xml
@@ -230,8 +230,8 @@
     </select>
   <select id="selectTableInfo" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbShopTableVO">
     select a.*, b.user_id, c.master_id, c.id as orderId, c.order_no as orderNo, c.amount as orderAmount from tb_shop_table a
-    left join tb_order_info b on a.qrcode=b.table_id and (b.`status`='unpaid' or b.`status`='paying') and b.user_id is not null
-    left join tb_order_info c on a.qrcode=c.table_id and (c.`status`='unpaid' or c.`status`='paying') and c.master_id is not null
+    left join tb_order_info b on a.qrcode=b.table_id and (b.`status`='unpaid' or b.`status`='paying') and b.user_id is not null and b.shop_id=#{shopId}
+    left join tb_order_info c on a.qrcode=c.table_id and (c.`status`='unpaid' or c.`status`='paying') and c.master_id is not null and c.shop_id=#{shopId}
     where a.shop_id=#{shopId}
     <if test="areaId != null and areaId !=''">
       and a.area_id = #{areaId}