From 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 17 一月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SeckillActivityInfoServiceImpl.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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 a27c0fb..53d542a 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
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.common.core.utils.PageUtils;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.feignClient.OrderClient;
@@ -62,7 +64,7 @@
private GoodsEvaluateService goodsEvaluateService;
@Override
- public List<SeckillActivityVO> listSeckillActivity(Goods goods) {
+ public TableDataInfo<SeckillActivityVO> listSeckillActivity(Goods goods) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
AppUser appUser = appUserClient.getAppUserById(loginUserApplet.getUserid());
goods.setVipId(appUser.getVipId());
@@ -76,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); // 未开始
@@ -98,23 +100,29 @@
int endIndex = Math.min(startIndex + pageSize, sortedList.size());
if (startIndex >= sortedList.size()) {
- return new ArrayList<>();
+ return new TableDataInfo();
}
-
- return seckillActivityVOS;
+ TableDataInfo tableDataInfo = new TableDataInfo();
+ tableDataInfo.setRows(sortedList.subList(startIndex, endIndex));
+ tableDataInfo.setTotal(sortedList.size());
+ tableDataInfo.setCode(200);
+ return tableDataInfo;
}
private Comparator<SeckillActivityVO> getComparator(String orderByColumn, String isAsc) {
+ if (StringUtils.isEmpty(orderByColumn)){
+ return Comparator.comparing(SeckillActivityVO::getId);
+ }
Comparator<SeckillActivityVO> comparator;
switch (orderByColumn) {
- case "sellingPrice":
+ case "tgs.selling_price":
comparator = Comparator.comparing(SeckillActivityVO::getSellingPrice);
break;
case "integral":
comparator = Comparator.comparing(SeckillActivityVO::getIntegral);
break;
- case "saleNum":
+ case "sale_num":
comparator = Comparator.comparing(SeckillActivityVO::getSaleNum);
break;
// 添加其他排序字段
@@ -197,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("该秒杀商品已在其他秒杀活动中存在");
}
@@ -216,8 +226,10 @@
@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"));
+ .eq(SeckillActivityInfo::getIsShelves, 1).last(" and (" + startTime + " between start_time and end_time or " + endTime + " between start_time and end_time)"));
if(1 < count){
throw new RuntimeException("该秒杀商品已在其他秒杀活动中存在");
}
--
Gitblit v1.7.1