diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesAddMaterialDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesAddMaterialDTO.java index d8fff4c..6e9e1c3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesAddMaterialDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesAddMaterialDTO.java @@ -18,7 +18,18 @@ public class MenuDishesAddMaterialDTO { message = "{menu_material_type_null}" ) Integer materialType; - public Long getMaterialId() { + @ApiModelProperty("食材名称") + private String materialName; + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public Long getMaterialId() { return this.materialId; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java index a148eeb..1aa2607 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java @@ -128,7 +128,8 @@ public class MenuDishesServiceImpl implements IMenuDishesService { return menuDishesMapper.addFinalNutrition(nutritionEntity,Long.parseLong(menuDishesDTO.getDishesId())); } - + //添加菜品和材料关系表 + menuDishesMapper.addMenuMaterialDishes(Long.parseLong(menuDishesDTO.getDishesId()),materialList); return menuDishesMapper.editMenuDishes(menuDishesDTO); // } catch (Exception e) { // throw new ServiceException(e.toString()); diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml index f213e70..9b994a0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml @@ -529,8 +529,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + delete from menu_material_dishes where dishes_id = #{dishesId}; insert into menu_material_dishes(dishes_id,material_id,weight,material_type) - values (#{dishesId}, #{item.materialId}, #{item.weight}, #{item.materialType}) @@ -538,7 +538,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"