From 92a12430ed9a18f66df68fc94ddda47f5e5ececf Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 27 Nov 2025 18:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8E=A8=20=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/admin/BkContactListController.java   | 2 +-
 .../java/com/czg/controller/kitchen/TableController.java    | 6 +++---
 .../src/main/java/com/czg/account/vo/BkTableVO.java         | 2 +-
 .../src/main/resources/mapper/BkOrderMapper.xml             | 2 +-
 4 files changed, 6 insertions(+), 6 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 c9d7aa843..f213a111e 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
@@ -59,7 +59,7 @@ public class BkContactListController {
 
 
     /**
-     * 预约端-台桌：查询预约单列表
+     * 预约端-预定单：查询预约单列表
      */
 //    @SaAdminCheckPermission(value = "bk:bkOrder:bookings", name = "预约端-预约单：列表")
     @GetMapping("/bkOrder/bookings")
diff --git a/cash-api/order-server/src/main/java/com/czg/controller/kitchen/TableController.java b/cash-api/order-server/src/main/java/com/czg/controller/kitchen/TableController.java
index aca99b1a6..3ef6e4cab 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/kitchen/TableController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/kitchen/TableController.java
@@ -35,7 +35,7 @@ public class TableController {
      * 按台桌查看
      */
     @GetMapping("getKitchenTable")
-    @SaAdminCheckPermission(value = "kitchen:table", name = "后厨-按台桌查看")
+//    @SaAdminCheckPermission(value = "kitchen:table", name = "后厨-按台桌查看")
     public CzgResult<List<KitchenTableVO>> getKitchenTable(@RequestParam(required = false) String tableName, @RequestParam(required = false) Long areaId) {
         Long shopId = StpKit.USER.getShopId();
         List<KitchenTableVO> kitchenTables = kitchenDetailMapper.getKitchenTable(shopId, tableName, areaId);
@@ -46,7 +46,7 @@ public class TableController {
      * 按台桌查看 商品内容
      */
     @GetMapping("getKitchenTableFoods")
-    @SaAdminCheckPermission(value = "kitchen:tableFood", name = "后厨-按台桌查看商品内容")
+//    @SaAdminCheckPermission(value = "kitchen:tableFood", name = "后厨-按台桌查看商品内容")
     public CzgResult<List<KitchenTableFoodVO>> getKitchenTableFoods(@RequestParam(required = false) Long orderId,
                                                                     @RequestParam(required = false) String tableCode,
                                                                     @RequestParam(required = false) Long isNoTable) {
@@ -63,7 +63,7 @@ public class TableController {
      * 按商品查看
      */
     @GetMapping("getKitchenFood")
-    @SaAdminCheckPermission(value = "kitchen:table", name = "后厨-按台桌查看")
+//    @SaAdminCheckPermission(value = "kitchen:table", name = "后厨-按台桌查看")
     public CzgResult<List<KitchenFoodVO>> getKitchenFood(@RequestParam(required = false) String productName) {
         Long shopId = StpKit.USER.getShopId();
         List<KitchenFoodVO> kitchenFood = kitchenDetailMapper.getKitchenFood(shopId, productName);
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 a511520eb..abd9e1120 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
@@ -17,7 +17,7 @@ public class BkTableVO {
     private List<BkTableVO.TableVO> tables;
 
     record TableVO(
-            String tableName, List<BkOrder> bkOrders
+            Long tableId,String tableName, List<BkOrder> bkOrders
     ) {
     }
 
diff --git a/cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml b/cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml
index 6e0ec3a00..cfb6ac62e 100644
--- a/cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/BkOrderMapper.xml
@@ -6,7 +6,7 @@
 
     <select id="bookings" resultType="com.czg.account.entity.BkOrder">
         SELECT
-        o.*, IFNULL(GROUP_CONCAT(DISTINCT t.name SEPARATOR '、'), '') AS tableInFos
+        o.*, IFNULL(GROUP_CONCAT(DISTINCT t.table_name SEPARATOR '、'), '') AS tableInFos
         FROM bk_order o
         LEFT JOIN bk_order_table t ON t.book_order_id = o.id
         WHERE o.shop_id = #{shopId}