From 103cb3dbd9df9a32565d718b782edcb1b0fdf51c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 19:44:59 +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/service/impl/SeckillActivityInfoServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
index 6155d24..eeced5c 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java
@@ -78,7 +78,7 @@
LocalDateTime endTime = seckillActivityVO.getEndTime();
if (endTime.isBefore(now)){
seckillActivityVO.setStatus(3); //已结束
- }else if (startTime.isBefore(now)){
+ }else if (startTime.isBefore(now) && endTime.isAfter(now)){
seckillActivityVO.setStatus(2); // 已开始
}else {
seckillActivityVO.setStatus(1); // 未开始
--
Gitblit v1.7.1