From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:36:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java | 72 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 3 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 fa4f8ff..d368c7c 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
@@ -1,8 +1,25 @@
package com.ruoyi.other.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
+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.ZoneOffset;
+import java.util.List;
/**
* <p>
@@ -12,9 +29,58 @@
* @author luodangjia
* @since 2024-11-20
*/
+@Api(tags = "秒杀活动信息")
@RestController
@RequestMapping("/seckill-activity-info")
-public class SeckillActivityInfoController {
+public class SeckillActivityInfoController extends BaseController {
+ @Resource
+ private SeckillActivityInfoService seckillActivityInfoService;
+
+ @Resource
+ private GoodsSeckillService goodsSeckillService;
+
+
+
+
+ /**
+ * 秒杀活动列表
+ */
+ @GetMapping("/list")
+ @ApiOperation(value = "秒杀活动列表",tags = {"小程序-商城-首页-秒杀活动列表"})
+ public R<TableDataInfo> list(Goods goods)
+ {
+ startPage();
+ return R.ok(getDataTable(seckillActivityInfoService.listSeckillActivity(goods)));
+ }
+
+ /**
+ * 秒杀活动详情
+ */
+ @GetMapping("/detail/{id}")
+ @ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页-秒杀活动列表-秒杀活动详情"})
+ public R<SeckillActivityDetailVO> detail(@PathVariable("id") Integer id)
+ {
+ return R.ok(seckillActivityInfoService.detail(id));
+ }
+
+
+ /**
+ * 根据商品id和会员等级获取对应的秒杀活动
+ */
+ @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"));
+ if(null == one){
+ return R.ok();
+ }
+ GoodsSeckill goodsSeckill = goodsSeckillService.getOne(new LambdaQueryWrapper<GoodsSeckill>().eq(GoodsSeckill::getSeckillActivityInfoId, one.getGoodId()).eq(GoodsSeckill::getVip, info.getVip()));
+ if(null != goodsSeckill){
+ goodsSeckill.setEndTime(one.getEndTime().toEpochSecond(ZoneOffset.UTC) * 1000);
+ }
+ return R.ok(goodsSeckill);
+ }
+
}
--
Gitblit v1.7.1