From f28142767f8823667499e6e94a76789f601f1654 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java |   68 +++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
index 4d6fd43..41dae65 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -47,7 +48,7 @@
      * 秒杀活动列表
      */
     @GetMapping("/list")
-    @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页"})
+    @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"})
     public R<TableDataInfo> list(Goods goods)
     {
         startPage();
@@ -81,6 +82,69 @@
         }
         return R.ok(goodsSeckill);
     }
-    
+
+
+    /**
+     * 新增秒杀活动
+     */
+    @PostMapping("/save")
+    @ApiOperation(value = "新增秒杀活动", tags = {"后台管理-活动管理-秒杀活动" })
+    public R<Void> save(@RequestBody SeckillActivityInfo seckillActivityInfo)
+    {
+        seckillActivityInfoService.saveSeckillActivityInfo(seckillActivityInfo);
+        return R.ok();
+    }
+
+    /**
+     * 修改秒杀活动
+     */
+    @PutMapping("/update")
+    @ApiOperation(value = "修改秒杀活动", tags = {"后台管理-活动管理-秒杀活动" })
+    public R<Void> update(@RequestBody SeckillActivityInfo seckillActivityInfo)
+    {
+        seckillActivityInfoService.updateSeckillActivityInfo(seckillActivityInfo);
+        return R.ok();
+    }
+
+    /**
+     * 删除秒杀活动
+     */
+    @DeleteMapping("/remove/{id}")
+    @ApiOperation(value = "删除秒杀活动", tags = {"后台管理-活动管理-秒杀活动" })
+    public R<Void> remove(@PathVariable Integer id)
+    {
+        seckillActivityInfoService.removeById(id);
+        return R.ok();
+    }
+
+    /**
+     * 获取秒杀活动明细
+     */
+    @GetMapping("/getSeckillActivityDetail")
+    @ApiOperation(value = "获取秒杀活动明细", tags = {"后台管理-活动管理-秒杀活动" })
+    public R<SeckillActivityInfo> getSeckillActivityDetail(Integer id)
+    {
+        SeckillActivityInfo seckillActivityInfo = seckillActivityInfoService.getById(id);
+        List<GoodsSeckill> goodsSeckills = goodsSeckillService.list(new LambdaQueryWrapper<GoodsSeckill>()
+                .eq(GoodsSeckill::getSeckillActivityInfoId, id));
+        seckillActivityInfo.setGoodsSeckills(goodsSeckills);
+        return R.ok(seckillActivityInfo);
+    }
+
+    /**
+     * 修改上/下架状态
+     */
+    @PutMapping("/updateShowStatus")
+    @ApiOperation(value = "修改上/下架状态", tags = {"后台管理-活动管理-秒杀活动" })
+    public R<Void> updateShowStatus(@RequestBody SeckillActivityVO seckillActivityVO)
+    {
+        seckillActivityInfoService.update(new LambdaUpdateWrapper<SeckillActivityInfo>()
+                .eq(SeckillActivityInfo::getId, seckillActivityVO.getId())
+                .set(SeckillActivityInfo::getIsShelves, seckillActivityVO.getShowStatus()));
+        return R.ok();
+    }
+
+
+
 }
 

--
Gitblit v1.7.1