From f3eae73688de36b750150046d679257bd80de451 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 17 一月 2025 17:02:36 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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..ff5a6c9 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); // 未开始
@@ -110,6 +110,9 @@
}
private Comparator<SeckillActivityVO> getComparator(String orderByColumn, String isAsc) {
+ if (StringUtils.isEmpty(orderByColumn)){
+ return Comparator.comparing(SeckillActivityVO::getId);
+ }
Comparator<SeckillActivityVO> comparator;
switch (orderByColumn) {
@@ -202,8 +205,10 @@
@Transactional(rollbackFor = Exception.class)
public void saveSeckillActivityInfo(SeckillActivityInfo seckillActivityInfo) {
Integer goodId = seckillActivityInfo.getGoodId();
+ LocalDateTime startTime = seckillActivityInfo.getStartTime();
+ LocalDateTime endTime = seckillActivityInfo.getEndTime();
long count = this.count(new LambdaQueryWrapper<SeckillActivityInfo>().eq(SeckillActivityInfo::getGoodId, goodId).eq(SeckillActivityInfo::getDelFlag, 0)
- .eq(SeckillActivityInfo::getIsShelves, 1).last(" and now() between start_time and end_time"));
+ .eq(SeckillActivityInfo::getIsShelves, 1).last(" and (" + startTime + " between start_time and end_time or " + endTime + " between start_time and end_time)"));
if(0 < count){
throw new RuntimeException("该秒杀商品已在其他秒杀活动中存在");
}
@@ -221,9 +226,11 @@
@Transactional(rollbackFor = Exception.class)
public void updateSeckillActivityInfo(SeckillActivityInfo seckillActivityInfo) {
Integer goodId = seckillActivityInfo.getGoodId();
+ LocalDateTime startTime = seckillActivityInfo.getStartTime();
+ LocalDateTime endTime = seckillActivityInfo.getEndTime();
long count = this.count(new LambdaQueryWrapper<SeckillActivityInfo>().eq(SeckillActivityInfo::getGoodId, goodId).eq(SeckillActivityInfo::getDelFlag, 0)
- .eq(SeckillActivityInfo::getIsShelves, 1).last(" and now() between start_time and end_time"));
- if(1 < count){
+ .eq(SeckillActivityInfo::getIsShelves, 1).last(" and (" + startTime + " between start_time and end_time or " + endTime + " between start_time and end_time)"));
+ if(0 < count){
throw new RuntimeException("该秒杀商品已在其他秒杀活动中存在");
}
this.baseMapper.updateById(seckillActivityInfo);
--
Gitblit v1.7.1