From 1e2aec636a6210b644940a652a14308fe5e4e282 Mon Sep 17 00:00:00 2001
From: slhaf <2998813882@qq.com>
Date: Thu, 12 Sep 2024 21:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2=E5=A5=97?=
 =?UTF-8?q?=E9=A4=90=E3=80=81=E8=8F=9C=E5=93=81=E8=B5=B7=E5=94=AE=E5=81=9C?=
 =?UTF-8?q?=E5=94=AE=EF=BC=88TODO=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/SetmealController.java   | 14 ++++++++++++++
 .../com/sky/mapper/SetmealDishMapper.java     |  5 +++++
 .../java/com/sky/service/SetmealService.java  |  8 ++++++++
 .../sky/service/impl/SetmealServiceImpl.java  | 19 +++++++++++++++++++
 4 files changed, 46 insertions(+)

diff --git a/sky-server/src/main/java/com/sky/controller/admin/SetmealController.java b/sky-server/src/main/java/com/sky/controller/admin/SetmealController.java
index 69ec31a..7843d3a 100644
--- a/sky-server/src/main/java/com/sky/controller/admin/SetmealController.java
+++ b/sky-server/src/main/java/com/sky/controller/admin/SetmealController.java
@@ -5,6 +5,7 @@ import com.sky.dto.SetmealPageQueryDTO;
 import com.sky.result.PageResult;
 import com.sky.result.Result;
 import com.sky.service.SetmealService;
+import com.sky.vo.SetmealVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -60,4 +61,17 @@ public class SetmealController {
         setmealService.deleteBatch(ids);
         return Result.success();
     }
+
+    /**
+     * 根据id查询套餐
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    @ApiOperation("根据id查询套餐")
+    public Result<SetmealVO> getById(@PathVariable Long id){
+        log.info("根据id查询套餐");
+        SetmealVO setmealVO = setmealService.getByIdWithSetmealDishes(id);
+        return Result.success(setmealVO);
+    }
 }
diff --git a/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java b/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java
index f02de6c..dceae37 100644
--- a/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java
+++ b/sky-server/src/main/java/com/sky/mapper/SetmealDishMapper.java
@@ -1,7 +1,9 @@
 package com.sky.mapper;
 
+import com.sky.entity.Dish;
 import com.sky.entity.SetmealDish;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -17,4 +19,7 @@ public interface SetmealDishMapper {
     void insertBatch(List<SetmealDish> setmealDishes);
 
     void deleteBySetmealIds(List<Long> setmealIds);
+
+    @Select("select * from setmeal_dish where setmeal_id = #{setmealId}")
+    List<SetmealDish> selectBySetmealId(Long setmealId);
 }
diff --git a/sky-server/src/main/java/com/sky/service/SetmealService.java b/sky-server/src/main/java/com/sky/service/SetmealService.java
index e813b9d..9266e4c 100644
--- a/sky-server/src/main/java/com/sky/service/SetmealService.java
+++ b/sky-server/src/main/java/com/sky/service/SetmealService.java
@@ -3,6 +3,7 @@ package com.sky.service;
 import com.sky.dto.SetmealDTO;
 import com.sky.dto.SetmealPageQueryDTO;
 import com.sky.result.PageResult;
+import com.sky.vo.SetmealVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -27,4 +28,11 @@ public interface SetmealService {
      * @param ids
      */
     void deleteBatch(List<Long> ids);
+
+    /**
+     * 根据id查询套餐（及关联菜品）
+     * @param id
+     * @return
+     */
+    SetmealVO getByIdWithSetmealDishes(Long id);
 }
diff --git a/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java
index 7027bcc..80cb928 100644
--- a/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java
+++ b/sky-server/src/main/java/com/sky/service/impl/SetmealServiceImpl.java
@@ -6,6 +6,7 @@ import com.sky.constant.MessageConstant;
 import com.sky.constant.StatusConstant;
 import com.sky.dto.SetmealDTO;
 import com.sky.dto.SetmealPageQueryDTO;
+import com.sky.entity.Dish;
 import com.sky.entity.Setmeal;
 import com.sky.entity.SetmealDish;
 import com.sky.exception.DeletionNotAllowedException;
@@ -13,6 +14,7 @@ import com.sky.mapper.SetmealDishMapper;
 import com.sky.mapper.SetmealMapper;
 import com.sky.result.PageResult;
 import com.sky.service.SetmealService;
+import com.sky.vo.SetmealVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -81,4 +83,21 @@ public class SetmealServiceImpl implements SetmealService {
         //删除setmeal_dish数据
         setmealDishMapper.deleteBySetmealIds(ids);
     }
+
+    /**
+     * 根据id查询套餐（及关联菜品）
+     * @param id
+     * @return
+     */
+    @Override
+    public SetmealVO getByIdWithSetmealDishes(Long id) {
+        SetmealVO setmealVO = new SetmealVO();
+        //查询基本套餐信息
+        Setmeal setmeal = setmealMapper.selectById(id);
+        BeanUtils.copyProperties(setmeal,setmealVO);
+        //查询对应菜品信息
+        List<SetmealDish> setmealDishes = setmealDishMapper.selectBySetmealId(id);
+        setmealVO.setSetmealDishes(setmealDishes);
+        return setmealVO;
+    }
 }