Commit cf0ee966c8eeeed4e13bd08274f29514daf86409

Authored by 痴货
1 parent 2bca9ef4

【BUG】解决秒杀活动未开始时不展示秒杀活动

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java
@@ -69,9 +69,11 @@ public interface SeckillActivityMapper extends BaseMapperX<SeckillActivityDO> { @@ -69,9 +69,11 @@ public interface SeckillActivityMapper extends BaseMapperX<SeckillActivityDO> {
69 .setSql("stock = stock + " + count)); 69 .setSql("stock = stock + " + count));
70 } 70 }
71 71
72 - default PageResult<SeckillActivityDO> selectPage(AppSeckillActivityPageReqVO pageReqVO, Integer status) { 72 + default PageResult<SeckillActivityDO> selectPage(AppSeckillActivityPageReqVO pageReqVO, Integer status, LocalDateTime dateTime) {
73 return selectPage(pageReqVO, new LambdaQueryWrapperX<SeckillActivityDO>() 73 return selectPage(pageReqVO, new LambdaQueryWrapperX<SeckillActivityDO>()
74 .eqIfPresent(SeckillActivityDO::getStatus, status) 74 .eqIfPresent(SeckillActivityDO::getStatus, status)
  75 + .lt(SeckillActivityDO::getStartTime, dateTime)
  76 + .gt(SeckillActivityDO::getEndTime, dateTime)// 开始时间 < 指定时间 < 结束时间,也就是说获取指定时间段的活动
75 .apply(ObjectUtil.isNotNull(pageReqVO.getConfigId()), "FIND_IN_SET(" + pageReqVO.getConfigId() + ",config_ids) > 0")); 77 .apply(ObjectUtil.isNotNull(pageReqVO.getConfigId()), "FIND_IN_SET(" + pageReqVO.getConfigId() + ",config_ids) > 0"));
76 } 78 }
77 79
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
@@ -110,7 +110,7 @@ public interface SeckillActivityService { @@ -110,7 +110,7 @@ public interface SeckillActivityService {
110 List<SeckillActivityDO> getSeckillActivityListByConfigIdAndStatus(Long configId, Integer status); 110 List<SeckillActivityDO> getSeckillActivityListByConfigIdAndStatus(Long configId, Integer status);
111 111
112 /** 112 /**
113 - * 通过活动时段获取秒杀活动 113 + * 通过活动时段获取开始的秒杀活动
114 * 114 *
115 * @param pageReqVO 请求 115 * @param pageReqVO 请求
116 * @return 秒杀活动列表 116 * @return 秒杀活动列表
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
@@ -292,7 +292,7 @@ public class SeckillActivityServiceImpl implements SeckillActivityService { @@ -292,7 +292,7 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
292 292
293 @Override 293 @Override
294 public PageResult<SeckillActivityDO> getSeckillActivityAppPageByConfigId(AppSeckillActivityPageReqVO pageReqVO) { 294 public PageResult<SeckillActivityDO> getSeckillActivityAppPageByConfigId(AppSeckillActivityPageReqVO pageReqVO) {
295 - return seckillActivityMapper.selectPage(pageReqVO, CommonStatusEnum.ENABLE.getStatus()); 295 + return seckillActivityMapper.selectPage(pageReqVO, CommonStatusEnum.ENABLE.getStatus(),LocalDateTime.now());
296 } 296 }
297 297
298 @Override 298 @Override