diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java index 19c05c8..a873196 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberCouponServiceImpl.java @@ -189,19 +189,18 @@ public class UmsMemberCouponServiceImpl implements UmsMemberCouponService { List couponIds = cpcrList.stream().map(SmsCouponProductCategoryRelation::getCouponId).collect(Collectors.toList()); allCouponIds.addAll(couponIds); } - if(CollUtil.isEmpty(allCouponIds)){ - return new ArrayList<>(); - } //所有优惠券 SmsCouponExample couponExample = new SmsCouponExample(); couponExample.createCriteria().andEndTimeGreaterThan(new Date()) .andStartTimeLessThan(new Date()) .andUseTypeEqualTo(0); - couponExample.or(couponExample.createCriteria() - .andEndTimeGreaterThan(new Date()) - .andStartTimeLessThan(new Date()) - .andUseTypeNotEqualTo(0) - .andIdIn(allCouponIds)); + if(CollUtil.isNotEmpty(allCouponIds)){ + couponExample.or(couponExample.createCriteria() + .andEndTimeGreaterThan(new Date()) + .andStartTimeLessThan(new Date()) + .andUseTypeNotEqualTo(0) + .andIdIn(allCouponIds)); + } return couponMapper.selectByExample(couponExample); }