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 | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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..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
@@ -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;
@@ -105,6 +106,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