From 6b3a3251bc06b081903dfe94134f034608c18ba4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 16:03:01 +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 | 6 +++---
1 files changed, 3 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 f158f0f..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
@@ -111,11 +111,11 @@
LocalDateTime now = LocalDateTime.now();
LocalDateTime endTime = record.getEndTime();
if (endTime.isBefore(now)){
- record.setStatus(2); //已结束
+ record.setStatus(3); //已结束
}else if (startTime.isBefore(now)){
- record.setStatus(1); // 已开始
+ record.setStatus(2); // 已开始
}else {
- record.setStatus(0); // 未开始
+ record.setStatus(1); // 未开始
}
}
return R.ok(IPage);
--
Gitblit v1.7.1