diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java index 09e143c0f..c1ab8cc30 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java @@ -98,10 +98,9 @@ public interface SeckillActivityMapper extends BaseMapperX { * @param dateTime 指定日期 * @return 活动列表 */ - default List selectListByIdsAndDateTimeLt(Collection ids, List confidIds, LocalDateTime dateTime) { + default List selectListByIdsAndDateTimeLt(Collection ids, LocalDateTime dateTime) { return selectList(new LambdaQueryWrapperX() .in(SeckillActivityDO::getId, ids) - .in(SeckillActivityDO::getConfigIds,confidIds) .lt(SeckillActivityDO::getStartTime, dateTime) .gt(SeckillActivityDO::getEndTime, dateTime)// 开始时间 < 指定时间 < 结束时间,也就是说获取指定时间段的活动 .orderByDesc(SeckillActivityDO::getCreateTime)); diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillconfig/SeckillConfigMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillconfig/SeckillConfigMapper.java index 456cf2c3f..1d205189f 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillconfig/SeckillConfigMapper.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillconfig/SeckillConfigMapper.java @@ -27,13 +27,4 @@ public interface SeckillConfigMapper extends BaseMapperX { return selectList(SeckillConfigDO::getStatus, status); } - default List selectListByIdsAndDateTimeLt(LocalDateTime dateTime){ - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss"); - String format = formatter.format(dateTime); - return selectList(new LambdaQueryWrapper() - .eq(SeckillConfigDO::getStatus, CommonStatusEnum.ENABLE.getStatus()) - .lt(SeckillConfigDO::getStartTime, format) - .gt(SeckillConfigDO::getEndTime, format)); - } - } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java index 41b619599..a3ec43840 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java @@ -34,7 +34,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import static cn.hutool.core.collection.CollUtil.isNotEmpty; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -335,12 +334,9 @@ public class SeckillActivityServiceImpl implements SeckillActivityService { if (CollUtil.isEmpty(spuIdAndActivityIdMaps)) { return Collections.emptyList(); } - // 2.查询当前时间属于哪个时间段 - List seckillConfigList= seckillConfigMapper.selectListByIdsAndDateTimeLt(dateTime); - List confidIds = seckillConfigList.stream().map(SeckillConfigDO::getId).collect(Collectors.toList()); - // 3.查询活动详情 + // 2.查询活动详情 return seckillActivityMapper.selectListByIdsAndDateTimeLt( - convertSet(spuIdAndActivityIdMaps, map -> MapUtil.getLong(map, "activityId")), confidIds, dateTime); + convertSet(spuIdAndActivityIdMaps, map -> MapUtil.getLong(map, "activityId")), dateTime); } }