From a988a89e6b0cd75a5df4691eb8196c0ef9513a05 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 19:46:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 108 insertions(+), 4 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 d368c7c..50b09d0 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,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -9,15 +12,19 @@
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.mapper.SeckillActivityInfoMapper;
import com.ruoyi.other.service.GoodsSeckillService;
+import com.ruoyi.other.service.GoodsService;
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 io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.List;
@@ -29,7 +36,7 @@
* @author luodangjia
* @since 2024-11-20
*/
-@Api(tags = "秒杀活动信息")
+@Api("秒杀活动信息")
@RestController
@RequestMapping("/seckill-activity-info")
public class SeckillActivityInfoController extends BaseController {
@@ -38,6 +45,12 @@
@Resource
private GoodsSeckillService goodsSeckillService;
+
+ @Resource
+ private SeckillActivityInfoMapper seckillActivityInfoMapper;
+
+ @Resource
+ private GoodsService goodsService;
@@ -47,7 +60,7 @@
* 秒杀活动列表
*/
@GetMapping("/list")
- @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页-秒杀活动列表"})
+ @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"})
public R<TableDataInfo> list(Goods goods)
{
startPage();
@@ -58,7 +71,7 @@
* 秒杀活动详情
*/
@GetMapping("/detail/{id}")
- @ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页-秒杀活动列表-秒杀活动详情"})
+ @ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页"})
public R<SeckillActivityDetailVO> detail(@PathVariable("id") Integer id)
{
return R.ok(seckillActivityInfoService.detail(id));
@@ -81,6 +94,97 @@
}
return R.ok(goodsSeckill);
}
-
+
+
+ /**
+ * 秒杀活动列表
+ */
+ @GetMapping("/manageList")
+ @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页","后台管理-活动管理-秒杀活动"})
+ public R<IPage<SeckillActivityVO>> manageList(@ApiParam("页码") @RequestParam Integer pageNum,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ Goods goods)
+ {
+ IPage<SeckillActivityVO> IPage = seckillActivityInfoMapper.querySeckillActivity(Page.of(pageNum, pageSize), goods);
+ for (SeckillActivityVO record : IPage.getRecords()) {
+ LocalDateTime startTime = record.getStartTime();
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime endTime = record.getEndTime();
+ if (endTime.isBefore(now)){
+ record.setStatus(3); //已结束
+ }else if (startTime.isBefore(now)){
+ record.setStatus(2); // 已开始
+ }else {
+ record.setStatus(1); // 未开始
+ }
+ }
+ return R.ok(IPage);
+ }
+
+ /**
+ * 新增秒杀活动
+ */
+ @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);
+ Integer goodId = seckillActivityInfo.getGoodId();
+ Goods goods = goodsService.getById(goodId);
+ seckillActivityInfo.setGoods(goods);
+ 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