diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenTableVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenTableVO.java index 1e44d645a..2ed914b19 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenTableVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenTableVO.java @@ -35,6 +35,14 @@ public class KitchenTableVO { * 区域名称 */ private String areaName; + /** + * 服务员名称 + */ + private String staffName; + /** + * 下单时间 + */ + private String orderTime; /** * 待上菜数 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 43bbaa662..b6192ab3f 100644 --- a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml @@ -39,6 +39,8 @@ SELECT `order`.id AS orderId, `table`.id AS tableId, + `staff`.`name` AS staffName, + detail.order_time AS orderTime, CASE WHEN `table`.id IS NULL THEN '' ELSE COALESCE (`order`.table_code, '') END AS tableCode, COALESCE(`table`.`name`, '无台桌') AS tableName, `table`.`area_id` AS areaId, @@ -47,6 +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_table` `table` ON `order`.table_code = `table`.table_code LEFT JOIN `tb_shop_table_area` `area` ON `table`.area_id = `area`.id WHERE