From 44159715ac76ce36f2984e908c3b2d7ff236fbbd Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 28 Nov 2025 14:03:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=20=E7=94=A8=E9=A4=90?=
 =?UTF-8?q?=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/account/vo/BkTableVO.java         | 1 +
 .../src/main/resources/mapper/BkOrderTableMapper.xml        | 2 ++
 .../src/main/resources/mapper/KitchenDetailMapper.xml       | 6 +++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/BkTableVO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/BkTableVO.java
index 1fb94391a..6ffd77104 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/BkTableVO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/BkTableVO.java
@@ -18,6 +18,7 @@ public class BkTableVO {
     public static class TableVO {
         private Long tableId;
         private String tableName;
+        private Integer tableUserNum;
         private List<BkOrder> bkOrders;
     }
 
diff --git a/cash-service/account-service/src/main/resources/mapper/BkOrderTableMapper.xml b/cash-service/account-service/src/main/resources/mapper/BkOrderTableMapper.xml
index 3466edbcc..52019b38c 100644
--- a/cash-service/account-service/src/main/resources/mapper/BkOrderTableMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/BkOrderTableMapper.xml
@@ -19,6 +19,7 @@
         `area`.`name` as area_name,
         `table`.id as table_id,
         `table`.`name` as table_name,
+        `table`.`max_capacity` as table_user_num,
         `order`.call_phone,
         `order`.call_username,
         `order`.booking_phone,
@@ -54,6 +55,7 @@
         <!-- 桌台级别映射 -->
         <id property="tableId" column="table_id"/>
         <result property="tableName" column="table_name"/>
+        <result property="tableUserNum" column="table_user_num"/>
 
         <!-- 嵌套集合：订单列表 -->
         <collection property="bkOrders" ofType="com.czg.account.vo.BkTableVO$BkOrder">
diff --git a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml
index b6192ab3f..a4032f6dd 100644
--- a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml
@@ -23,7 +23,7 @@
                detail.food_serve_time                                                        AS foodServeTime
         FROM `tb_order_detail` detail
                  INNER JOIN `tb_order_info` `order` ON detail.order_id = `order`.id AND `order`.`status` = 'unpaid'
-                 LEFT JOIN `tb_shop_staff` `staff` ON staff.id = `order`.staff_id
+                 LEFT JOIN `tb_shop_staff` `staff` ON staff.id = `order`.staff_id and staff.shop_id = #{shopId}
                  LEFT JOIN `tb_shop_table` `table` ON `order`.table_code = `table`.table_code
                  LEFT JOIN `tb_shop_table_area` `area` ON `table`.area_id = `area`.id
         WHERE detail.shop_id = #{shopId}
@@ -49,7 +49,7 @@
         FROM
         `tb_order_detail` detail
         INNER JOIN `tb_order_info` `order` ON detail.order_id = `order`.id AND `order`.`status` = 'unpaid'
-        LEFT JOIN `tb_shop_staff` `staff` ON staff.id = `order`.staff_id
+        LEFT JOIN `tb_shop_staff` `staff` ON staff.id = `order`.staff_id and staff.shop_id = #{shopId}
         LEFT JOIN `tb_shop_table` `table` ON `order`.table_code = `table`.table_code
         LEFT JOIN `tb_shop_table_area` `area` ON `table`.area_id = `area`.id
         WHERE
@@ -81,7 +81,7 @@
         FROM `tb_order_detail` detail
         INNER JOIN `tb_order_info` `order` ON detail.order_id = `order`.id AND `order`.`status` = 'unpaid'
         LEFT JOIN `tb_shop_table` `table` ON `order`.table_code = `table`.table_code
-        LEFT JOIN `tb_shop_staff` `staff` ON staff.id = `order`.staff_id
+        LEFT JOIN `tb_shop_staff` `staff` ON staff.id = `order`.staff_id and staff.shop_id = #{shopId}
         WHERE detail.shop_id = #{shopId}
         AND detail.`status` = 'wait-pay'
         <if test="orderId != null">