lostecho/mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优惠券获取逻辑修改

Browse Source
This commit is contained in:
macro
2022-11-14 19:42:21 +08:00
parent 89c84ce8da
commit 85194a3165
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java
View File

@@ -189,19 +189,18 @@ public class UmsMemberCouponServiceImpl implements UmsMemberCouponService {
List<Long> couponIds = cpcrList.stream().map(SmsCouponProductCategoryRelation::getCouponId).collect(Collectors.toList()); List<Long> couponIds = cpcrList.stream().map(SmsCouponProductCategoryRelation::getCouponId).collect(Collectors.toList());
allCouponIds.addAll(couponIds); allCouponIds.addAll(couponIds);
} }
if(CollUtil.isEmpty(allCouponIds)){
return new ArrayList<>();
}
//所有优惠券 //所有优惠券
SmsCouponExample couponExample = new SmsCouponExample(); SmsCouponExample couponExample = new SmsCouponExample();
couponExample.createCriteria().andEndTimeGreaterThan(new Date()) couponExample.createCriteria().andEndTimeGreaterThan(new Date())
.andStartTimeLessThan(new Date()) .andStartTimeLessThan(new Date())
.andUseTypeEqualTo(0); .andUseTypeEqualTo(0);
couponExample.or(couponExample.createCriteria() if(CollUtil.isNotEmpty(allCouponIds)){
.andEndTimeGreaterThan(new Date()) couponExample.or(couponExample.createCriteria()
.andStartTimeLessThan(new Date()) .andEndTimeGreaterThan(new Date())
.andUseTypeNotEqualTo(0) .andStartTimeLessThan(new Date())
.andIdIn(allCouponIds)); .andUseTypeNotEqualTo(0)
.andIdIn(allCouponIds));
}
return couponMapper.selectByExample(couponExample); return couponMapper.selectByExample(couponExample);
} }