Commit 9ae3682b2de415fd656b1d0f77814e329b58b43e

Authored by YunaiV
1 parent caf49aae

【功能修复】商城:秒杀活动的活动排重校验不正确的问题

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java
@@ -31,9 +31,9 @@ public interface SeckillActivityMapper extends BaseMapperX<SeckillActivityDO> { @@ -31,9 +31,9 @@ public interface SeckillActivityMapper extends BaseMapperX<SeckillActivityDO> {
31 .orderByDesc(SeckillActivityDO::getId)); 31 .orderByDesc(SeckillActivityDO::getId));
32 } 32 }
33 33
34 - default List<SeckillActivityDO> selectListByStatus(Integer status) {  
35 - return selectList(new LambdaQueryWrapperX<SeckillActivityDO>()  
36 - .eqIfPresent(SeckillActivityDO::getStatus, status)); 34 + default List<SeckillActivityDO> selectListBySpuIdAndStatus(Long spuId, Integer status) {
  35 + return selectList(SeckillActivityDO::getSpuId, spuId,
  36 + SeckillActivityDO::getStatus, status);
37 } 37 }
38 38
39 /** 39 /**
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
@@ -97,7 +97,7 @@ public class SeckillActivityServiceImpl implements SeckillActivityService { @@ -97,7 +97,7 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
97 seckillConfigService.validateSeckillConfigExists(configIds); 97 seckillConfigService.validateSeckillConfigExists(configIds);
98 98
99 // 2.1 查询所有开启的秒杀活动 99 // 2.1 查询所有开启的秒杀活动
100 - List<SeckillActivityDO> activityList = seckillActivityMapper.selectListByStatus(CommonStatusEnum.ENABLE.getStatus()); 100 + List<SeckillActivityDO> activityList = seckillActivityMapper.selectListBySpuIdAndStatus(spuId, CommonStatusEnum.ENABLE.getStatus());
101 if (activityId != null) { // 排除自己 101 if (activityId != null) { // 排除自己
102 activityList.removeIf(item -> ObjectUtil.equal(item.getId(), activityId)); 102 activityList.removeIf(item -> ObjectUtil.equal(item.getId(), activityId));
103 } 103 }