From 13ab9f7057550f473f75b91b7f1939bfc23b1f9d Mon Sep 17 00:00:00 2001
From: LeJingS <157603342+LeJingS@users.noreply.github.com>
Date: Tue, 31 Dec 2024 12:08:29 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B412=E6=9C=8831=E6=97=A512:08:26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sky_Delivery/font/nginx-1.20.2/logs/nginx.pid      |  2 +-
 .../src/main/java/com/sky/entity/Category.java     |  2 +-
 .../com/sky/controller/admin/DishController.java   | 12 ++++++++++++
 .../src/main/java/com/sky/service/DishService.java |  4 ++++
 .../java/com/sky/service/impl/DishServiceImpl.java | 14 ++++++++++++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/Sky_Delivery/font/nginx-1.20.2/logs/nginx.pid b/Sky_Delivery/font/nginx-1.20.2/logs/nginx.pid
index fbe5a4b..8b5804b 100644
--- a/Sky_Delivery/font/nginx-1.20.2/logs/nginx.pid
+++ b/Sky_Delivery/font/nginx-1.20.2/logs/nginx.pid
@@ -1 +1 @@
-15156
+12408
diff --git a/Sky_Delivery/server/sky-take-out/sky-pojo/src/main/java/com/sky/entity/Category.java b/Sky_Delivery/server/sky-take-out/sky-pojo/src/main/java/com/sky/entity/Category.java
index 3ddb205..29a6710 100644
--- a/Sky_Delivery/server/sky-take-out/sky-pojo/src/main/java/com/sky/entity/Category.java
+++ b/Sky_Delivery/server/sky-take-out/sky-pojo/src/main/java/com/sky/entity/Category.java
@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class Category implements Serializable {
+public class  Category implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/controller/admin/DishController.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/controller/admin/DishController.java
index 9785a4f..5f6525d 100644
--- a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/controller/admin/DishController.java
+++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/controller/admin/DishController.java
@@ -11,6 +11,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /*
 * 菜品管理
 * */
@@ -37,4 +39,14 @@ public class DishController {
         PageResult pageResult =  dishService.pageQuery(dishPageQueryDTO);
         return Result.success(pageResult);
     }
+
+    //删除菜品，涉及dish、dish_flavor、setmeal_dish表
+//    注解自动将字符串转为长整形集合
+    @DeleteMapping
+    @ApiOperation("批量删除")
+    public Result delete(@RequestParam List<Long> ids){
+        log.info("菜品批量删除{}",ids);
+        dishService.deleteBatch(ids);
+        return Result.success();
+    }
 }
diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/DishService.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/DishService.java
index 924ae5a..6a389ad 100644
--- a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/DishService.java
+++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/DishService.java
@@ -4,9 +4,13 @@ import com.sky.dto.DishDTO;
 import com.sky.dto.DishPageQueryDTO;
 import com.sky.result.PageResult;
 
+import java.util.List;
+
 public interface DishService {
 //    新增菜品和对应的口味
     public void saveWithFlavor(DishDTO dishDTO);
 //      菜品分页查询
     PageResult pageQuery(DishPageQueryDTO dishPageQueryDTO);
+//菜品批量删除
+    void deleteBatch(List<Long> ids);
 }
diff --git a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java
index b9c4267..899135b 100644
--- a/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java
+++ b/Sky_Delivery/server/sky-take-out/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java
@@ -61,4 +61,18 @@ public class DishServiceImpl implements DishService {
         Page<DishVO> page = dishMapper.pageQuery(dishPageQueryDTO);
         return new PageResult(page.getTotal(),page.getResult());
     }
+
+//  菜品批量删除
+    @Override
+    public void deleteBatch(List<Long> ids) {
+//        判断是否是起售中的菜品
+
+//        判断是否与套餐有关联
+
+//        执行删除菜品数据
+
+//        删除关联的口味数据
+
+
+    }
 }