From 8a9d096781ad37bfe8c7ff8090fde97add2483b9 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 26 Nov 2025 18:15:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8E=A8=20=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E6=8C=89=E5=8F=B0=E6=A1=8C=E6=9F=A5=E7=9C=8B=20=E6=8C=89?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/kitchen/TableController.java | 73 +++++++++++ .../java/com/czg/order/vo/KitchenFoodVO.java | 34 +++++ .../com/czg/order/vo/KitchenTableFoodVO.java | 35 ++++++ .../java/com/czg/order/vo/KitchenTableVO.java | 45 +++++++ .../order/mapper/KitchenDetailMapper.java | 32 +++++ .../resources/mapper/KitchenDetailMapper.xml | 118 ++++++++++++++++++ 6 files changed, 337 insertions(+) create mode 100644 cash-api/order-server/src/main/java/com/czg/controller/kitchen/TableController.java create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenFoodVO.java create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenTableFoodVO.java create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenTableVO.java create mode 100644 cash-service/order-service/src/main/java/com/czg/service/order/mapper/KitchenDetailMapper.java create mode 100644 cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml 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 new file mode 100644 index 000000000..f7a3d40d2 --- /dev/null +++ b/cash-api/order-server/src/main/java/com/czg/controller/kitchen/TableController.java @@ -0,0 +1,73 @@ +package com.czg.controller.kitchen; + +import com.czg.annotation.SaAdminCheckPermission; +import com.czg.order.vo.KitchenFoodVO; +import com.czg.order.vo.KitchenTableFoodVO; +import com.czg.order.vo.KitchenTableVO; +import com.czg.resp.CzgResult; +import com.czg.sa.StpKit; +import com.czg.service.order.mapper.KitchenDetailMapper; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 后厨：台桌/菜单 + * + * @author tankaikai + * @since 2025-03-07 15:25 + */ +@RestController +//@RequestMapping("/admin/kitchen") +@RequestMapping("/notify/kitchen") +public class TableController { + + @Resource + private KitchenDetailMapper kitchenDetailMapper; + + + /** + * 按台桌查看 + */ + @GetMapping("getKitchenTable") + @SaAdminCheckPermission(value = "kitchen:table", name = "后厨-按台桌查看") + public CzgResult> getKitchenTable(@RequestParam String tableName, @RequestParam Long areaId) { + Long shopId = StpKit.USER.getShopId(); + List kitchenTables = kitchenDetailMapper.getKitchenTable(shopId, tableName, areaId); + return CzgResult.success(kitchenTables); + } + + /** + * 按台桌查看 商品内容 + */ + @GetMapping("getKitchenTableFoods") + @SaAdminCheckPermission(value = "kitchen:tableFood", name = "后厨-按台桌查看商品内容") + public CzgResult> getKitchenTableFoods(@RequestParam(required = false) Long orderId, + @RequestParam(required = false) String tableCode, + @RequestParam(required = false) Long isNoTable) { + Long shopId = StpKit.USER.getShopId(); + if (isNoTable != null) { + tableCode = null; + } + List kitchenFood = kitchenDetailMapper.getKitchenTableFoods(shopId, orderId, tableCode, isNoTable); + return CzgResult.success(kitchenFood); + } + + + /** + * 按商品查看 + */ + @GetMapping("getKitchenFood") + @SaAdminCheckPermission(value = "kitchen:table", name = "后厨-按台桌查看") + public CzgResult> getKitchenFood(@RequestParam String productName) { + Long shopId = StpKit.USER.getShopId(); + List kitchenFood = kitchenDetailMapper.getKitchenFood(shopId, productName); + return CzgResult.success(kitchenFood); + } +} 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 new file mode 100644 index 000000000..8b878d0f1 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenFoodVO.java @@ -0,0 +1,34 @@ +package com.czg.order.vo; + +import lombok.Data; +import java.util.List; + +/** + * 后厨台桌列表 + * + * @author ww + * @description + */ +@Data +public class KitchenFoodVO { + + private Long productId; + //是否临时商品 0-否 1-是 + private int isTemporary; + + private String productName; + private String skuName; + + private List foodItems; + + record KitchenFoodItemVO( + //员工名称 + Long orderId, String staffName, + String tableName,String areaName,Long orderDetailId, + //下单数 //菜品状态 待起菜 PENDING_PREP 待出菜 READY_TO_SERVE 已出菜 SENT_OUT 已上菜 DELIVERED + Long num, String subStatus, + //下单时间 起菜时间 出菜时间 上菜时间 + String orderTime, String startOrderTime, String dishOutTime, String foodServeTime + ) { + } +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenTableFoodVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenTableFoodVO.java new file mode 100644 index 000000000..5f523fb8b --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenTableFoodVO.java @@ -0,0 +1,35 @@ +package com.czg.order.vo; + +import lombok.Data; + +import java.util.List; + +/** + * 后厨台桌列表 + * + * @author ww + * @description + */ +@Data +public class KitchenTableFoodVO { + + private Long productId; + private String productName; + private String skuName; + //是否临时商品 0-否 1-是 + private int isTemporary; + private String staffName; + private Long orderDetailId; + private Long num; + //菜品状态 待起菜 PENDING_PREP 待出菜 READY_TO_SERVE 已出菜 SENT_OUT 已上菜 DELIVERED + private String subStatus; + //下单时间 + private String orderTime; + //起菜时间 + private String startOrderTime; + //出菜时间 + private String dishOutTime; + //上菜时间 + private String foodServeTime; + +} 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 new file mode 100644 index 000000000..1e44d645a --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/KitchenTableVO.java @@ -0,0 +1,45 @@ +package com.czg.order.vo; + +import lombok.Data; + +/** + * 后厨台桌列表 + * + * @author ww + * @description + */ +@Data +public class KitchenTableVO { + /** + * 订单ID + */ + private Long orderId; + /** + * 台桌ID + */ + private Long tableId; + /** + * 台桌编码 + */ + private String tableCode; + /** + * 台桌名称 + */ + private String tableName; + + /** + * 区域ID + */ + private Long areaId; + /** + * 区域名称 + */ + private String areaName; + + /** + * 待上菜数 + */ + private Integer pendingDishCount; + + +} 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 new file mode 100644 index 000000000..287e8805a --- /dev/null +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/KitchenDetailMapper.java @@ -0,0 +1,32 @@ +package com.czg.service.order.mapper; + +import com.czg.order.vo.KitchenFoodVO; +import com.czg.order.vo.KitchenTableFoodVO; +import com.czg.order.vo.KitchenTableVO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 后厨 台桌列表/商品列表 + * + * @author ww + * @description + */ +@Mapper +public interface KitchenDetailMapper { + /** + * 按台桌查看 + */ + List getKitchenTable(Long shopId, String tableName, Long areaId); + + /** + * 按台桌查看商品内容 + */ + List getKitchenTableFoods(Long shopId, Long orderId, String tableCode, Long isNoTable); + + /** + * 按台桌查看商品列表 + */ + List getKitchenFood(Long shopId, String productName); +} \ 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 new file mode 100644 index 000000000..43bbaa662 --- /dev/null +++ b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +