新增套餐

sky-pojo/src/main/java/com/sky/dto/SetmealDTO.java

@@ -2,6 +2,7 @@ package com.sky.dto;
 
 import com.sky.entity.SetmealDish;
 import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -11,25 +12,18 @@ import java.util.List;
 public class SetmealDTO implements Serializable {
 
     private Long id;
-
     // 分类id
     private Long categoryId;
-
     // 套餐名称
     private String name;
-
     // 套餐价格
     private BigDecimal price;
-
     // 状态 0:停用 1:启用
     private Integer status;
-
     // 描述信息
     private String description;
-
     // 图片
     private String image;
-
     // 套餐菜品关系
     private List<SetmealDish> setmealDishes = new ArrayList<>();
 

sky-server/src/main/java/com/sky/controller/admin/CategoryController.java

@@ -104,6 +104,7 @@ public class CategoryController {
     @GetMapping("/list")
     @ApiOperation("根据类型查询分类")
     public Result<List<Category>> list(Integer type) {
+        log.info("根据类型查询分类 type:{}", type);
         List<Category> list = categoryService.list(type);
         return Result.success(list);
     }

sky-server/src/main/java/com/sky/controller/admin/SetmealController.java

@@ -1,9 +1,36 @@
 package com.sky.controller.admin;
 
+import com.sky.dto.SetmealDTO;
+import com.sky.result.Result;
+import com.sky.service.SetmealService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 @RestController
+@RequestMapping("/admin/setmeal")
+@Api(tags = "套餐相关接口")
 @Slf4j
 public class SetmealController {
+    @Resource
+    private SetmealService setmealService;
+
+    /**
+     * 新增套餐
+     *
+     * @param setmealDTO SetmealDTO
+     * @return Result<String>
+     */
+    @ApiOperation("新增套餐")
+    @PostMapping()
+    public Result<String> save(@RequestBody SetmealDTO setmealDTO) {
+        setmealService.saveWithDish(setmealDTO);
+        return Result.success();
+    }
 }

sky-server/src/main/java/com/sky/mapper/SetMealDishMapper.java

@@ -2,6 +2,7 @@ package com.sky.mapper;
 
 import com.sky.annotation.AutoFill;
 import com.sky.entity.Setmeal;
+import com.sky.entity.SetmealDish;
 import com.sky.enumeration.OperationType;
 import com.sky.vo.DishItemVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -33,4 +34,11 @@ public interface SetMealDishMapper {
      */
     @AutoFill(OperationType.UPDATE)
     void update(Setmeal setmeal);
+
+    /**
+     * 保存套餐和菜品的关联关系
+     *
+     * @param setmealDishes List<SetmealDish>
+     */
+    void insertBatch(List<SetmealDish> setmealDishes);
 }

sky-server/src/main/java/com/sky/mapper/SetmealMapper.java

@@ -1,9 +1,10 @@
 package com.sky.mapper;
 
+import com.sky.annotation.AutoFill;
 import com.sky.entity.Setmeal;
+import com.sky.enumeration.OperationType;
 import com.sky.vo.DishItemVO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -11,6 +12,7 @@ import java.util.List;
 public interface SetmealMapper {
     /**
      * 根据分类id查询套餐的数量
+     *
      * @param id Long
      * @return Integer
      */
@@ -18,6 +20,7 @@ public interface SetmealMapper {
 
     /**
      * 动态条件查询套餐
+     *
      * @param setmeal Setmeal
      * @return List<Setmeal>
      */
@@ -25,8 +28,17 @@ public interface SetmealMapper {
 
     /**
      * 根据套餐id查询菜品选项
+     *
      * @param setmealId
      * @return
      */
     List<DishItemVO> getDishItemBySetmealId(Long setmealId);
+
+    /**
+     * 向套餐表插入数据
+     *
+     * @param setmeal Setmeal
+     */
+    @AutoFill(OperationType.INSERT)
+    void insert(Setmeal setmeal);
 }

sky-server/src/main/java/com/sky/service/SetmealService.java

@@ -1,27 +1,34 @@
 package com.sky.service;
 
 import com.sky.dto.SetmealDTO;
-import com.sky.dto.SetmealPageQueryDTO;
 import com.sky.entity.Setmeal;
-import com.sky.result.PageResult;
 import com.sky.vo.DishItemVO;
-import com.sky.vo.SetmealVO;
+
 import java.util.List;
 
 public interface SetmealService {
 
     /**
      * 条件查询
-     * @param setmeal
+     *
-     * @return
+     * @param setmeal Setmeal
+     * @return List<Setmeal>
      */
     List<Setmeal> list(Setmeal setmeal);
 
     /**
      * 根据id查询菜品选项
+     *
      * @param id
      * @return
      */
     List<DishItemVO> getDishItemById(Long id);
 
+
+    /**
+     * 新增套餐，同时需要保存套餐和菜品的关联关系
+     *
+     * @param setmealDTO SetmealDTO
+     */
+    void saveWithDish(SetmealDTO setmealDTO);
 }

sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java

@@ -1,12 +1,15 @@
 package com.sky.service.impl;
 
+import com.sky.dto.SetmealDTO;
 import com.sky.entity.Setmeal;
+import com.sky.entity.SetmealDish;
 import com.sky.mapper.DishMapper;
 import com.sky.mapper.SetMealDishMapper;
 import com.sky.mapper.SetmealMapper;
 import com.sky.service.SetmealService;
 import com.sky.vo.DishItemVO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -45,4 +48,26 @@ public class SetmealServiceImpl implements SetmealService {
     public List<DishItemVO> getDishItemById(Long id) {
         return setmealMapper.getDishItemBySetmealId(id);
     }
+
+    /**
+     * 新增套餐，同时需要保存套餐和菜品的关联关系
+     *
+     * @param setmealDTO SetmealDTO
+     */
+    @Override
+    public void saveWithDish(SetmealDTO setmealDTO) {
+        Setmeal setmeal = new Setmeal();
+        BeanUtils.copyProperties(setmealDTO, setmeal);
+
+        // 向套餐表插入数据
+        setmealMapper.insert(setmeal);
+        // 获取生成的套餐id
+        Long setmealId = setmeal.getId();
+        List<SetmealDish> setmealDishes = setmealDTO.getSetmealDishes();
+        setmealDishes.forEach(setmealDish -> {
+            setmealDish.setSetmealId(setmealId);
+        });
+        // 保存套餐和菜品的关联关系
+        setmealDishMapper.insertBatch(setmealDishes);
+    }
 }

sky-server/src/main/resources/mapper/SetMealDishMapper.xml

@@ -2,6 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.sky.mapper.SetMealDishMapper">
 
+    <!-- 保存套餐和菜品的关联关系 -->
+    <insert id="insertBatch" parameterType="list">
+        insert into setmeal_dish
+        (setmeal_id,dish_id,name,price,copies)
+        values
+        <foreach collection="setmealDishes" item="sd" separator=",">
+            (#{sd.setmealId},#{sd.dishId},#{sd.name},#{sd.price},#{sd.copies})
+        </foreach>
+    </insert>
+
     <!-- 菜品起售停售 -->
     <update id="update" parameterType="Setmeal">
         update setmeal

sky-server/src/main/resources/mapper/SetmealMapper.xml

@@ -2,6 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.sky.mapper.SetmealMapper">
 
+    <!-- 向套餐表插入数据 -->
+    <insert id="insert" parameterType="Setmeal" useGeneratedKeys="true" keyProperty="id">
+        insert into setmeal
+        (category_id, name, price, status, description, image, create_time, update_time, create_user, update_user)
+        values (#{categoryId}, #{name}, #{price}, #{status}, #{description}, #{image}, #{createTime}, #{updateTime},
+                #{createUser}, #{updateUser})
+    </insert>
+
     <!-- 根据分类id查询套餐的数量 -->
     <select id="countByCategoryId" resultType="java.lang.Integer">
         select count(id)