From f2cacd8646ff504e5e7783fdbe984cbd3eaad8cb Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 4 Jun 2025 10:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4cook=5Fdishes=5Fbase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/cook/CookDishesMapper.xml      | 5 +----
 .../src/main/resources/mapper/cook/CookH5Mapper.xml          | 4 ++--
 .../src/main/resources/mapper/cook/CookRecipeMapper.xml      | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookDishesMapper.xml
index e6e11f7..4219d2c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookDishesMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookDishesMapper.xml
@@ -77,11 +77,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stallName"    column="stall_name"    />
         <result property="areaName"    column="area_name"    />
         <result property="dishesTypeName"    column="dishes_type_name"    />
-        <result property="baseDishesId"    column="base_dishes_id"    />
     </resultMap>
 
     <sql id="selectCookDishesVo">
-        select dishes_id,base_dishes_id, meal_type, custom_id, inventory_id, dishes_name, alias_name, bar_code, intro, cook_id, type_id,cdt.dishes_type_name, classify_id,
+        select dishes_id, meal_type, custom_id, inventory_id, dishes_name, alias_name, bar_code, intro, cook_id, type_id,cdt.dishes_type_name, classify_id,
                effect_id, style_id, if_local_feature, dishes_depart, sequence, pungency_degree, sales_mode, size_type, size_json,
                weight, large_weight, little_weight, weight_deviation, price, unit_price, large_price, little_price, image_url,
                particulars, recommend, index_recommend, like_survey, like_batch, like_num, initial_score, calories, protein, fat,
@@ -250,7 +249,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertCookDishes" parameterType="com.bonus.canteen.core.cook.domain.CookDishes" useGeneratedKeys="true" keyProperty="dishesId">
         insert into cook_dishes
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="baseDishesId != null">base_dishes_id,</if>
             <if test="mealType != null">meal_type,</if>
             <if test="customId != null">custom_id,</if>
             <if test="inventoryId != null">inventory_id,</if>
@@ -321,7 +319,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="baseDishesId != null">#{baseDishesId},</if>
             <if test="mealType != null">#{mealType},</if>
             <if test="customId != null">#{customId},</if>
             <if test="inventoryId != null">#{inventoryId},</if>
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookH5Mapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookH5Mapper.xml
index d9452bf..180679f 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookH5Mapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookH5Mapper.xml
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="typeId" column="type_id"/>
             <result property="typeName" column="type_name"/>
             <collection property="dishesList" ofType="com.bonus.canteen.core.cook.vo.CookH5WeekDishesVO">
-                <result property="baseDishesId" column="base_dishes_id"/>
+                <result property="dishesId" column="dishes_id"/>
                 <result property="dishesName" column="dishes_name"/>
                 <result property="dishesImgUrl" column="dishes_img_url"/>
                 <result property="recipeDetailId" column="recipe_detail_id"/>
@@ -194,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="typeId" column="type_id"/>
             <result property="typeName" column="type_name"/>
             <collection property="dishesList" ofType="com.bonus.canteen.core.cook.vo.CookH5ReserveRecipeDishesVO">
-                <result property="baseDishesId" column="base_dishes_id"/>
+                <result property="dishesId" column="dishes_id"/>
                 <result property="dishesName" column="dishes_name"/>
                 <result property="detailType" column="detail_type"/>
                 <result property="dishesImgUrl" column="dishes_img_url"/>
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 9ced249..f0e67ab 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
@@ -130,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getDishesCountByRecipeIds" resultType="com.bonus.canteen.core.cook.vo.CookRecipeDishesCountVO">
         SELECT
-        mrd.recipe_id,count(DISTINCT(md.base_dishes_id)) as count
+        mrd.recipe_id,count(DISTINCT(md.dishes_id)) as count
         FROM
         cook_recipe_detail mrd
         LEFT JOIN cook_recipe_dishes mrdd ON mrd.recipe_detail_id = mrdd.recipe_detail_id