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 1/2] =?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 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 @@ + 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' From de4f3050441211ca152ae493829a2be1a1adc2f8 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 28 Nov 2025 15:10:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/kitchen/TableController.java | 4 ++-- .../src/main/java/com/czg/account/vo/BkTableVO.java | 1 + .../main/java/com/czg/order/vo/KitchenFoodVO.java | 2 +- .../main/resources/mapper/BkOrderTableMapper.xml | 2 ++ .../service/order/mapper/KitchenDetailMapper.java | 2 +- .../main/resources/mapper/KitchenDetailMapper.xml | 13 +++++++++++-- 6 files changed, 18 insertions(+), 6 deletions(-) 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 3ef6e4cab..f84450f35 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 @@ -64,9 +64,9 @@ public class TableController { */ @GetMapping("getKitchenFood") // @SaAdminCheckPermission(value = "kitchen:table", name = "后厨-按台桌查看") - public CzgResult> getKitchenFood(@RequestParam(required = false) String productName) { + public CzgResult> getKitchenFood(@RequestParam(required = false) String productName, @RequestParam(required = false) Long categoryId) { Long shopId = StpKit.USER.getShopId(); - List kitchenFood = kitchenDetailMapper.getKitchenFood(shopId, productName); + List kitchenFood = kitchenDetailMapper.getKitchenFood(shopId, productName, categoryId); return CzgResult.success(kitchenFood); } } 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 6ffd77104..e12951998 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 String tableStatus; private Integer tableUserNum; private List bkOrders; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenFoodVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenFoodVO.java index 8b878d0f1..1da3b826a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenFoodVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenFoodVO.java @@ -24,7 +24,7 @@ public class KitchenFoodVO { record KitchenFoodItemVO( //员工名称 Long orderId, String staffName, - String tableName,String areaName,Long orderDetailId, + String tableName,String areaName,Long orderDetailId,Long categoryId,String categoryName, //下单数 //菜品状态 待起菜 PENDING_PREP 待出菜 READY_TO_SERVE 已出菜 SENT_OUT 已上菜 DELIVERED Long num, String subStatus, //下单时间 起菜时间 出菜时间 上菜时间 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 52019b38c..706d496bd 100644 --- a/cash-service/account-service/src/main/resources/mapper/BkOrderTableMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/BkOrderTableMapper.xml @@ -20,6 +20,7 @@ `table`.id as table_id, `table`.`name` as table_name, `table`.`max_capacity` as table_user_num, + `table`.`status` as table_status, `order`.call_phone, `order`.call_username, `order`.booking_phone, @@ -56,6 +57,7 @@ + diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/KitchenDetailMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/KitchenDetailMapper.java index 287e8805a..73f03b1ea 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/KitchenDetailMapper.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/KitchenDetailMapper.java @@ -28,5 +28,5 @@ public interface KitchenDetailMapper { /** * 按台桌查看商品列表 */ - List getKitchenFood(Long shopId, String productName); + List getKitchenFood(Long shopId, String productName, Long categoryId); } \ No newline at end of file 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 a4032f6dd..2c19edff7 100644 --- a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml @@ -12,8 +12,10 @@ detail.sku_name AS skuName, `order`.id AS orderId, detail.id AS orderDetailId, - COALESCE(`table`.`name`, '无台桌') AS tableName, - CASE WHEN `table`.id IS NULL THEN '吧台' ELSE COALESCE(`area`.`name`, '') END AS areaName, + `category`.id AS categoryId, + `category`.name AS categoryName, + COALESCE(`table`.`name`, '无台桌') AS tableName, + CASE WHEN `table`.id IS NULL THEN '吧台' ELSE COALESCE(`area`.`name`, '') END AS areaName, `staff`.`name` AS staffName, sum(detail.num - detail.return_num) AS num, detail.sub_status AS subStatus, @@ -24,10 +26,15 @@ 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 and staff.shop_id = #{shopId} + LEFT JOIN `tb_product` `product` ON `product`.id = `detail`.product_id and product.shop_id = #{shopId} + INNER JOIN `tb_shop_prod_category` `category` ON category.id = `product`.category_id and category.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} AND detail.`status` = 'wait-pay' + + AND `category`.id = #{categoryId} + AND detail.product_name like concat('%',#{productName},'%') @@ -108,6 +115,8 @@ + +