BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 267cd7acf357e76e69eddd65eaca6d11e61a7a42

Authored by 痴货
1 parent 9d1ef29d

【优化】优化使用营销的商品范围枚举

Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/reward/RewardActivityMapper.java
  View file @267cd7a
... ... @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
6 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
7 7 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
8 8 import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
  9 +import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
9 10 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 11 import org.apache.ibatis.annotations.Mapper;
11 12  
... ... @@ -65,9 +66,9 @@ public interface RewardActivityMapper extends BaseMapperX<RewardActivityDO> {
65 66 .eq(RewardActivityDO::getStatus,status)
66 67 .lt(RewardActivityDO::getStartTime, dateTime)
67 68 .gt(RewardActivityDO::getEndTime, dateTime)
68   - .and(i -> i. eq(RewardActivityDO::getProductScope, 2).and(i1 -> i1.apply(productScopeValuesFindInSetFunc.apply(spuIds))))
69   - .or(i -> i.eq(RewardActivityDO::getProductScope, 1))
70   - .or(i -> i. eq(RewardActivityDO::getProductScope, 3).and(i1 -> i1.apply(productScopeValuesFindInSetFunc.apply(categoryIds))))
  69 + .and(i -> i. eq(RewardActivityDO::getProductScope, PromotionProductScopeEnum.SPU.getScope()).and(i1 -> i1.apply(productScopeValuesFindInSetFunc.apply(spuIds))))
  70 + .or(i -> i.eq(RewardActivityDO::getProductScope, PromotionProductScopeEnum.ALL.getScope()))
  71 + .or(i -> i. eq(RewardActivityDO::getProductScope, PromotionProductScopeEnum.CATEGORY.getScope()).and(i1 -> i1.apply(productScopeValuesFindInSetFunc.apply(categoryIds))))
71 72 .orderByDesc(RewardActivityDO::getId)
72 73 .last("limit 1")
73 74 );
... ...