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 1da3b826a..46ce8418d 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 @@ -1,6 +1,7 @@ package com.czg.order.vo; import lombok.Data; + import java.util.List; /** @@ -18,13 +19,15 @@ public class KitchenFoodVO { private String productName; private String skuName; + private Long categoryId; + String categoryName; private List foodItems; record KitchenFoodItemVO( - //员工名称 - Long orderId, String staffName, - String tableName,String areaName,Long orderDetailId,Long categoryId,String categoryName, + //员工名称 + Long orderId, String staffName, + String tableName, String areaName, Long orderDetailId, //下单数 //菜品状态 待起菜 PENDING_PREP 待出菜 READY_TO_SERVE 已出菜 SENT_OUT 已上菜 DELIVERED Long num, String subStatus, //下单时间 起菜时间 出菜时间 上菜时间 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 2c19edff7..5abf405f4 100644 --- a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml @@ -108,6 +108,8 @@ + + @@ -115,8 +117,6 @@ - -