From 3d1291a5f4b32b7c683d2d3151e1b16b69ded9ad Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 29 May 2025 17:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E8=8F=9C=E8=B0=B1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/canteen/core/cook/vo/CookRecipeDishesVO.java | 10 ++++++++--
 .../main/resources/mapper/cook/CookRecipeMapper.xml    |  8 ++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookRecipeDishesVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookRecipeDishesVO.java
index cfe2d30..8d2b0f9 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookRecipeDishesVO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookRecipeDishesVO.java
@@ -82,16 +82,22 @@ public class CookRecipeDishesVO extends BaseEntity {
 
     @ApiModelProperty("菜品类型")
     private Integer mealType;
+
     @ApiModelProperty("成本价")
     private Integer materialCost;
-    @ApiModelProperty("类别名称")
-    private String typeName;
+
     @ApiModelProperty("类别id")
     private Long typeId;
+
+    @ApiModelProperty("类别名称")
+    private String dishesTypeName;
+
     @ApiModelProperty("食堂名称")
     private String canteenName;
+
     @ApiModelProperty("销售方式(1按份,2称重)")
     private Integer salesMode;
+
     @ApiModelProperty("称重单位多少克(默认1kg)")
     private Integer unitPrice;
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml
index fe7566a..bc41bf8 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeMapper.xml
@@ -35,8 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="sizeType" column="size_type"/>
             <result property="supplyNum" column="supply_num"/>
             <result property="saleNum" column="sale_num"/>
-            <result property="remanentNum" column="surplus_num"/>
-            <result property="limitNum" column="restrict_num"/>
+            <result property="remanentNum" column="remanent_num"/>
+            <result property="limitNum" column="limit_num"/>
             <result property="salePrice" column="sale_price"/>
             <result property="recommendFlag" column="recommend_flag"/>
             <result property="canteenName" column="canteen_name"/>
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="mealType" column="meal_type"/>
             <result property="materialCost" column="material_cost"/>
             <result property="typeId" column="type_id"/>
-            <result property="typeName" column="type_name"/>
+            <result property="dishesTypeName" column="dishes_type_name"/>
         </collection>
     </resultMap>
 
@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                crdd.size_type,
                crdd.supply_num,
                crdd.sale_num,
-               crdd.remanent_num,
+               (crdd.supply_num - crdd.sale_num) as remanent_num,
                crdd.limit_num,
                crdd.sale_price,
                crdd.recommend_flag,