From ec73339e08669dc5a0d4ff93e6640f51473c08cd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 一月 2025 18:03:50 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SeckillActivityInfoController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 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 4044eff..1a8fb82 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
@@ -24,6 +24,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.List;
@@ -71,9 +72,9 @@
*/
@GetMapping("/detail/{id}")
@ApiOperation(value = "秒杀活动详情", tags = {"小程序-商城-首页"})
- public R<SeckillActivityDetailVO> detail(@PathVariable("id") Integer id)
+ 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));
}
@@ -96,6 +97,18 @@
/**
+ * 获取商品秒杀活动
+ * @param id
+ * @return
+ */
+ @PostMapping("/getSeckillActivityInfoById")
+ public R<SeckillActivityInfo> getSeckillActivityInfoById(@RequestParam("id") Integer id){
+ SeckillActivityInfo one = seckillActivityInfoService.getById(id);
+ return R.ok(one);
+ }
+
+
+ /**
* 秒杀活动列表
*/
@GetMapping("/manageList")
@@ -105,6 +118,18 @@
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);
}
--
Gitblit v1.7.1