From 6674936ee596060e6e9b5551903fb9a528c59b3c Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 27 Nov 2025 19:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=AB=AF=20=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/BkContactListController.java        |  2 +-
 .../java/com/czg/account/vo/BkTableVO.java    | 22 ++++++-----
 .../resources/mapper/BkOrderTableMapper.xml   | 38 ++++++++++---------
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java
index f213a111e..6beaaaca6 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/BkContactListController.java
@@ -27,7 +27,7 @@ import java.util.Set;
  * @description
  */
 @RestController
-@RequestMapping("/admin/bk/notify")
+@RequestMapping("/admin/bk/")
 @Slf4j
 public class BkContactListController {
 
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 847da27d3..1fb94391a 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
@@ -11,18 +11,22 @@ import java.util.List;
 @Data
 public class BkTableVO {
     private Long areaId;
-
     private String areaName;
+    private List<TableVO> tables;
 
-    private List<BkTableVO.TableVO> tables;
-
-    record TableVO(
-            Long tableId,String tableName, List<BkOrder> bkOrders
-    ) {
+    @Data
+    public static class TableVO {
+        private Long tableId;
+        private String tableName;
+        private List<BkOrder> bkOrders;
     }
 
-    record BkOrder(
-            String callPhone, String callUsername, String bookingPhone, String bookingUsername, String bookingTime
-    ) {
+    @Data
+    public static class BkOrder {
+        private String callPhone;
+        private String callUsername;
+        private String bookingPhone;
+        private String bookingUsername;
+        private String bookingTime;
     }
 }
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 1236e84a3..3466edbcc 100644
--- a/cash-service/account-service/src/main/resources/mapper/BkOrderTableMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/BkOrderTableMapper.xml
@@ -27,13 +27,11 @@
         FROM
         `tb_shop_table` `table`
         LEFT JOIN tb_shop_table_area `area` on `table`.area_id = `area`.id
-        LEFT JOIN bk_order `order` ON `table`.shop_id = `order`.shop_id
-        AND DATE(`order`.booking_time) = #{day}
+        LEFT JOIN bk_order_table oTable on  `table`.id = oTable.table_id
+        LEFT JOIN bk_order `order` ON oTable.book_order_id = `order`.id AND DATE(`order`.booking_time) = #{day}
         <if test="seatTimeType != null and seatTimeType != ''">
             AND `order`.seat_time_type = #{seatTimeType}
         </if>
-        LEFT JOIN bk_order_table oTable on oTable.book_order_id = `order`.id
-        and `table`.id = oTable.table_id
         WHERE
         `table`.shop_id = #{shopId}
         AND `table`.`status` != 'unbound'
@@ -43,21 +41,27 @@
         ORDER BY `table`.area_id, `table`.id
     </select>
 
-
-
     <resultMap id="BkTableVOResultMap" type="com.czg.account.vo.BkTableVO">
-        <result property="areaId" column="area_id"/>
+        <!-- 区域级别映射 -->
+        <id property="areaId" column="area_id"/>
         <result property="areaName" column="area_name"/>
-        <collection property="tables" ofType="com.czg.account.vo.BkTableVO$TableVO" javaType="java.util.List">
-            <result property="tableId" column="table_id"/>
-            <result property="tableName" column="table_name"/>
-            <collection property="bkOrders" ofType="com.czg.account.vo.BkTableVO$BkOrder" javaType="java.util.List">
-                <result property="callPhone" column="call_phone"/>
-                <result property="callUsername" column="call_username"/>
-                <result property="bookingPhone" column="booking_phone"/>
-                <result property="bookingUsername" column="booking_username"/>
-                <result property="bookingTime" column="booking_time"/>
-            </collection>
+
+        <!-- 嵌套集合：桌台列表 -->
+        <collection property="tables" ofType="com.czg.account.vo.BkTableVO$TableVO" resultMap="tableVOResultMap"/>
+    </resultMap>
+
+    <resultMap id="tableVOResultMap" type="com.czg.account.vo.BkTableVO$TableVO">
+        <!-- 桌台级别映射 -->
+        <id property="tableId" column="table_id"/>
+        <result property="tableName" column="table_name"/>
+
+        <!-- 嵌套集合：订单列表 -->
+        <collection property="bkOrders" ofType="com.czg.account.vo.BkTableVO$BkOrder">
+            <result property="callPhone" column="call_phone"/>
+            <result property="callUsername" column="call_username"/>
+            <result property="bookingPhone" column="booking_phone"/>
+            <result property="bookingUsername" column="booking_username"/>
+            <result property="bookingTime" column="booking_time"/>
         </collection>
     </resultMap>
 </mapper>