Commit cdb31679da866ac188962ede6c167d46ab792d20
1 parent
d49c11fb
【功能修复】商城:限时折扣在 activityIds、skuIds 为空时,报 SQL 不正确的问题
Showing
2 changed files
with
6 additions
and
6 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/discount/DiscountProductMapper.java
| ... | ... | @@ -26,12 +26,6 @@ public interface DiscountProductMapper extends BaseMapperX<DiscountProductDO> { |
| 26 | 26 | return selectList(DiscountProductDO::getActivityId, activityIds); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - default List<DiscountProductDO> selectListBySpuIdsAndStatus(Collection<Long> spuIds, Integer status) { | |
| 30 | - return selectList(new LambdaQueryWrapperX<DiscountProductDO>() | |
| 31 | - .in(DiscountProductDO::getSpuId, spuIds) | |
| 32 | - .eq(DiscountProductDO::getActivityStatus, status)); | |
| 33 | - } | |
| 34 | - | |
| 35 | 29 | default void updateByActivityId(DiscountProductDO discountProductDO) { |
| 36 | 30 | update(discountProductDO, new LambdaUpdateWrapper<DiscountProductDO>() |
| 37 | 31 | .eq(DiscountProductDO::getActivityId, discountProductDO.getActivityId())); | ... | ... |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java
| ... | ... | @@ -220,11 +220,17 @@ public class DiscountActivityServiceImpl implements DiscountActivityService { |
| 220 | 220 | |
| 221 | 221 | @Override |
| 222 | 222 | public List<DiscountProductDO> getDiscountProductsByActivityId(Collection<Long> activityIds) { |
| 223 | + if (CollUtil.isEmpty(activityIds)) { | |
| 224 | + return CollUtil.newArrayList(); | |
| 225 | + } | |
| 223 | 226 | return discountProductMapper.selectList(DiscountProductDO::getActivityId, activityIds); |
| 224 | 227 | } |
| 225 | 228 | |
| 226 | 229 | @Override |
| 227 | 230 | public List<DiscountProductDO> getMatchDiscountProductListBySkuIds(Collection<Long> skuIds) { |
| 231 | + if (CollUtil.isEmpty(skuIds)) { | |
| 232 | + return CollUtil.newArrayList(); | |
| 233 | + } | |
| 228 | 234 | return discountProductMapper.selectListBySkuIdsAndStatusAndNow(skuIds, CommonStatusEnum.ENABLE.getStatus()); |
| 229 | 235 | } |
| 230 | 236 | ... | ... |