From 0fa9bb8baafaf6497069c2262767de6d3e00880b Mon Sep 17 00:00:00 2001
From: liux <963924687@qq.com>
Date: Mon, 21 Apr 2025 11:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E6=9F=A5=E8=AF=A2=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/menu/dto/MenuDishesAddMaterialDTO.java     | 13 ++++++++++++-
 .../menu/service/impl/MenuDishesServiceImpl.java    |  3 ++-
 .../main/resources/mapper/menu/MenuDishesMapper.xml |  7 +++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

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"
     </update>
 
     <insert id="addMenuMaterialDishes"  parameterType="java.util.List">
+        delete from menu_material_dishes where dishes_id = #{dishesId};
         insert into menu_material_dishes(dishes_id,material_id,weight,material_type)
-
         values
         <foreach collection="materialList" item="item" separator=",">
             (#{dishesId}, #{item.materialId}, #{item.weight}, #{item.materialType})
@@ -538,7 +538,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <select id="getMenuMaterialDishes" resultType="com.bonus.canteen.core.menu.dto.MenuDishesAddMaterialDTO">
-        select material_id as materialId,weight,material_type as materialType from menu_material_dishes where dishes_id = #{dishesId}
+        select mmd.material_id as materialId,mmd.weight,mmd.material_type as materialType,mm.material_name as materialName
+        from menu_material_dishes mmd
+        LEFT JOIN menu_material mm on mm.material_id = mmd.material_id
+        where mmd.dishes_id = #{dishesId}
     </select>
 
     <select id="getDishMessageByDishesId" resultType="com.bonus.canteen.core.menu.domain.MenuDishes">