From af8d528a2f1bdcee48cecde1d69f5ee99b8230e5 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 28 Nov 2025 17:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/order/vo/KitchenFoodVO.java    | 9 ++++++---
 .../src/main/resources/mapper/KitchenDetailMapper.xml    | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

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<KitchenFoodItemVO> 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 @@
         <result property="productId" column="productId"/>
         <result property="isTemporary" column="isTemporary"/>
         <result property="productName" column="productName"/>
+        <result property="categoryId" column="categoryId"/>
+        <result property="categoryName" column="categoryName"/>
         <collection property="foodItems" ofType="com.czg.order.vo.KitchenFoodVO$KitchenFoodItemVO">
             <constructor>
                 <arg column="orderId" javaType="java.lang.Long"/>
@@ -115,8 +117,6 @@
                 <arg column="tableName" javaType="java.lang.String"/>
                 <arg column="areaName" javaType="java.lang.String"/>
                 <arg column="orderDetailId" javaType="java.lang.Long"/>
-                <arg column="categoryId" javaType="java.lang.Long"/>
-                <arg column="categoryName" javaType="java.lang.String"/>
                 <arg column="num" javaType="java.lang.Long"/>
                 <arg column="subStatus" javaType="java.lang.String"/>
                 <arg column="orderTime" javaType="java.lang.String"/>