From c90a8ac772937f8f084356ea1f04c5dba1d9e5d5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 一月 2025 11:15:33 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 150 insertions(+), 13 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 e2a2d77..0780b0f 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,26 +2,32 @@
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.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.order.feignClient.OrderClient;
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.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.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalUnit;
+import java.time.format.DateTimeFormatter;
import java.util.List;
/**
@@ -32,7 +38,7 @@
* @author luodangjia
* @since 2024-11-20
*/
-@Api(tags = "秒杀活动信息")
+@Api("秒杀活动信息")
@RestController
@RequestMapping("/seckill-activity-info")
public class SeckillActivityInfoController extends BaseController {
@@ -41,6 +47,15 @@
@Resource
private GoodsSeckillService goodsSeckillService;
+
+ @Resource
+ private SeckillActivityInfoMapper seckillActivityInfoMapper;
+
+ @Resource
+ private GoodsService goodsService;
+
+ @Resource
+ private OrderClient orderClient;
@@ -50,10 +65,9 @@
* 秒杀活动列表
*/
@GetMapping("/list")
- @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页-秒杀活动列表"})
- public R<List<SeckillActivityVO>> list(Goods goods)
+ @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页"})
+ public R<TableDataInfo> list(Goods goods)
{
- startPage();
return R.ok(seckillActivityInfoService.listSeckillActivity(goods));
}
@@ -61,10 +75,10 @@
* 秒杀活动详情
*/
@GetMapping("/detail/{id}")
- @ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页-秒杀活动列表-秒杀活动详情"})
- public R<SeckillActivityDetailVO> detail(@PathVariable("id") Integer id)
+ @ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页"})
+ public R<SeckillActivityDetailVO> detail(@PathVariable("id") Integer id, String latitude, String longitude)
{
- return R.ok(seckillActivityInfoService.detail(id));
+ return R.ok(seckillActivityInfoService.detail(id, latitude, longitude));
}
@@ -74,16 +88,139 @@
@PostMapping("/getSeckillActivityInfo")
public R<GoodsSeckill> getSeckillActivityInfo(@RequestBody GetSeckillActivityInfo info){
SeckillActivityInfo one = seckillActivityInfoService.getOne(new LambdaQueryWrapper<SeckillActivityInfo>().eq(SeckillActivityInfo::getGoodId, info.getGoodsId())
- .eq(SeckillActivityInfo::getDelFlag, 0).last(" and now() between start_time and end_time order by create_time limit 0,1"));
+ .eq(SeckillActivityInfo::getDelFlag, 0).eq(SeckillActivityInfo::getIsShelves, 1).last(" and now() between start_time and end_time order by create_time limit 0,1"));
if(null == one){
return R.ok();
}
- GoodsSeckill goodsSeckill = goodsSeckillService.getOne(new LambdaQueryWrapper<GoodsSeckill>().eq(GoodsSeckill::getSeckillActivityInfoId, one.getGoodId()).eq(GoodsSeckill::getVip, info.getVip()));
+ GoodsSeckill goodsSeckill = goodsSeckillService.getOne(new LambdaQueryWrapper<GoodsSeckill>().eq(GoodsSeckill::getSeckillActivityInfoId, one.getId()).eq(GoodsSeckill::getVip, info.getVip()));
if(null != goodsSeckill){
- goodsSeckill.setEndTime(one.getEndTime().toEpochSecond(ZoneOffset.UTC) * 1000);
+ LocalDateTime endTime = one.getEndTime();
+ // 转时间戳
+ long timeStamp = endTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
+ goodsSeckill.setEndTime(timeStamp);
}
return R.ok(goodsSeckill);
}
+
+
+
+
+
+
+ /**
+ * 获取商品秒杀活动
+ * @param id
+ * @return
+ */
+ @PostMapping("/getSeckillActivityInfoById")
+ public R<SeckillActivityInfo> getSeckillActivityInfoById(@RequestParam("id") Integer id){
+ SeckillActivityInfo one = seckillActivityInfoService.getById(id);
+ return R.ok(one);
+ }
+
+
+ /**
+ * 秒杀活动列表
+ */
+ @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); // 未开始
+ }
+ Integer saleNum = orderClient.getGoodsSaleNum(record.getGoodsId(), 2).getData();
+ record.setSaleNum(saleNum);
+ }
+ return R.ok(IPage);
+ }
+
+ /**
+ * 新增秒杀活动
+ */
+ @PostMapping("/save")
+ @ApiOperation(value = "新增秒杀活动", tags = {"后台管理-活动管理-秒杀活动" })
+ public R<Void> save(@RequestBody SeckillActivityInfo seckillActivityInfo)
+ {
+ seckillActivityInfoService.saveSeckillActivityInfo(seckillActivityInfo);
+ return R.ok();
+ }
+
+ @GetMapping("/getSeckillActivityInfoByGoodsId")
+ public R<SeckillActivityInfo> getSeckillActivityInfoByGoodsId(@RequestParam("goodsId") Integer goodsId){
+ SeckillActivityInfo seckillActivityInfo = seckillActivityInfoService.getOne(new LambdaQueryWrapper<SeckillActivityInfo>()
+ .eq(SeckillActivityInfo::getGoodId, goodsId)
+ .eq(SeckillActivityInfo::getDelFlag, 0)
+ .eq(SeckillActivityInfo::getIsShelves, 1)
+ .last(" and now() between start_time and end_time"));
+ return R.ok(seckillActivityInfo);
+ }
+
+ /**
+ * 修改秒杀活动
+ */
+ @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