diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/AppletDishesDetailDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/AppletDishesDetailDTO.java index 177da1b..54bf0c2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/AppletDishesDetailDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/AppletDishesDetailDTO.java @@ -12,7 +12,7 @@ public class AppletDishesDetailDTO implements Serializable { @ApiModelProperty("菜谱详情id") private Long detailId; @ApiModelProperty("菜品id") - private Long baseDishesId; + private Long dishesId; @ApiModelProperty("是否删除(1删除,2未删除)") private Integer delFlag; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookDishesMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookDishesMapper.java index cd65765..1c3c27d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookDishesMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookDishesMapper.java @@ -69,14 +69,6 @@ public interface CookDishesMapper { */ public int checkDishIsExist(CookDishes cookDishes); - /** - * 新增菜品信息 - * - * @param cookDishes 菜品信息 - * @return 结果 - */ - int insertDishesName(CookDishes cookDishes); - /** * 新增菜品信息 * @@ -85,13 +77,6 @@ public interface CookDishesMapper { */ void insertDishesMaterial(@Param("list") List dishesMaterialList,@Param("dishesId") Long dishesId); - /** - * 修改菜品信息 - * - * @param cookDishes 菜品信息 - */ - void updateDishesName(CookDishes cookDishes); - /** * 删除菜品信息 * @@ -174,11 +159,4 @@ public interface CookDishesMapper { * @return 菜品材料类型信息 */ List getCookMaterialTypeMap(); - - /** - * 删除菜品信息 - * - * @param dishesIds 菜品id - */ - void deleteCookBaseDishesByDishesIds(Long[] dishesIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java index d479602..befc007 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java @@ -100,8 +100,6 @@ public class CookDishesServiceImpl implements ICookDishesService { try { checkParam(cookDishes, false); //计算营养信息含量 - //新增菜品名称 - cookDishesMapper.insertDishesName(cookDishes); //添加菜品 cookDishesMapper.insertCookDishes(cookDishes); //添加菜品-原料关联关系 @@ -128,8 +126,6 @@ public class CookDishesServiceImpl implements ICookDishesService { cookDishes.setUpdateTime(DateUtils.getNowDate()); try { checkParam(cookDishes, true); - //修改菜品名称 - cookDishesMapper.updateDishesName(cookDishes); //修改菜品 cookDishesMapper.updateCookDishes(cookDishes); //删除菜品-原料关联关系 @@ -186,7 +182,6 @@ public class CookDishesServiceImpl implements ICookDishesService { if (detailIdList != null && !detailIdList.isEmpty()) { cookDishesMapper.deleteCookDishesByDishPlanDetailIds(detailIdList, dishesIds); } - cookDishesMapper.deleteCookBaseDishesByDishesIds(dishesIds); return cookDishesMapper.deleteCookDishesByDishesIds(dishesIds); } 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 491eb17..e6e11f7 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 @@ -208,10 +208,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select - mdb.base_dishes_id, md.dishes_id, md.meal_type, md.custom_id, - mdb.dishes_name, + md.dishes_name, md.dishes_name as real_dishes_name, md.alias_name, md.image_url, @@ -409,11 +402,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" md.calcium, md.sodium from - cook_dishes_base mdb - left join cook_dishes md on mdb.base_dishes_id = md.base_dishes_id + cook_dishes md left join cook_recipe_dishes mrd on md.dishes_id = mrd.dishes_id where - mdb.base_dishes_id = #{baseDishesId} + md.dishes_id = #{dishesId} and mrd.recipe_detail_id = #{detailId} limit 1 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 fac5427..9ced249 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 @@ -163,8 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select crd.mealtime_type, crd.recipe_detail_id, cd.dishes_id, - cdb.base_dishes_id, - cdb.dishes_name, + cd.dishes_name, crdd.id, crdd.price, crdd.size_type, @@ -185,7 +184,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join cook_recipe_dishes crdd on crd.recipe_detail_id = crdd.recipe_detail_id left join cook_dishes cd on crdd.dishes_id = cd.dishes_id left join basic_canteen bc on cd.canteen_id = bc.canteen_id - left join cook_dishes_base cdb on cd.base_dishes_id = cdb.base_dishes_id left join cook_dishes_type cdt on cd.type_id = cdt.dishes_type_id where crd.recipe_id = #{recipeId} and crd.apply_date = #{applyDate} @@ -196,9 +194,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select DISTINCT mrd.mealtime_type, mrd.recipe_detail_id, - mdb.base_dishes_id , md.dishes_id, - mdb.dishes_name, + md.dishes_name, mrdd.id, mrdd.price, mrdd.size_type, @@ -219,7 +216,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join cook_recipe_dishes mrdd on mrd.recipe_detail_id = mrdd.recipe_detail_id left join cook_dishes md on mrdd.dishes_id = md.dishes_id left join basic_canteen ac on md.canteen_id = ac.canteen_id - left join cook_dishes_base mdb on md.base_dishes_id = mdb.base_dishes_id left join cook_dishes_type mdt on md.type_id = mdt.dishes_type_id where mrd.recipe_id = #{params.recipeId} @@ -232,8 +228,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"