From 85194a3165e2d33a557a95d184fcd08b9b5ec60f Mon Sep 17 00:00:00 2001 From: macro Date: Mon, 14 Nov 2022 19:42:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UmsMemberCouponServiceImpl.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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); }