From cb490e56ee7bccbc3b56d6964e9b68e5aa8ec475 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 17:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java | 89 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 75 insertions(+), 14 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 a57807b..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,24 +2,24 @@
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.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.api.domain.GoodsSeckill;
import com.ruoyi.other.api.domain.SeckillActivityInfo;
import com.ruoyi.other.api.vo.GetSeckillActivityInfo;
import com.ruoyi.other.service.GoodsSeckillService;
import com.ruoyi.other.service.SeckillActivityInfoService;
+import com.ruoyi.other.vo.SeckillActivityDetailVO;
+import com.ruoyi.other.vo.SeckillActivityVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.time.LocalDateTime;
import java.time.ZoneOffset;
-import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalUnit;
import java.util.List;
/**
@@ -30,7 +30,7 @@
* @author luodangjia
* @since 2024-11-20
*/
-@Api(tags = "秒杀活动信息")
+@Api("秒杀活动信息")
@RestController
@RequestMapping("/seckill-activity-info")
public class SeckillActivityInfoController extends BaseController {
@@ -48,28 +48,26 @@
* 秒杀活动列表
*/
@GetMapping("/list")
- @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页-秒杀活动列表"})
- public AjaxResult list(Goods goods)
+ @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"})
+ public R<TableDataInfo> list(Goods goods)
{
startPage();
- return AjaxResult.success(seckillActivityInfoService.listSeckillActivity(goods));
+ return R.ok(getDataTable(seckillActivityInfoService.listSeckillActivity(goods)));
}
/**
* 秒杀活动详情
*/
@GetMapping("/detail/{id}")
- @ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页-秒杀活动列表-秒杀活动详情"})
- public AjaxResult detail(@PathVariable("id") Integer id)
+ @ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页"})
+ public R<SeckillActivityDetailVO> detail(@PathVariable("id") Integer id)
{
- return AjaxResult.success(seckillActivityInfoService.detail(id));
+ return R.ok(seckillActivityInfoService.detail(id));
}
/**
* 根据商品id和会员等级获取对应的秒杀活动
- * @param info
- * @return
*/
@PostMapping("/getSeckillActivityInfo")
public R<GoodsSeckill> getSeckillActivityInfo(@RequestBody GetSeckillActivityInfo info){
@@ -84,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