Authored by tanling

优惠券促销+渠道

... ... @@ -110,8 +110,7 @@ public class CouponService {
// 渠道匹配
toMatchUserCouponBos = toMatchUserCouponBos.stream()
.filter(userCouponsBo -> StringUtils.isBlank(userCouponsBo.getBusinessClient())
|| (StringUtils.isNotBlank(chargeContext.getChargeParam().getBusinessClient()) &&
Arrays.asList(userCouponsBo.getBusinessClient().split(",")).contains(chargeContext.getChargeParam().getBusinessClient())))
|| Arrays.asList(userCouponsBo.getBusinessClient().split(",")).contains(chargeContext.getChargeParam().getBusinessClient()))
.collect(Collectors.toList());
//规则匹配
... ...
... ... @@ -481,7 +481,7 @@ public class PromotionService {
promotionBoList = promotionBoList.stream().filter(
promotion ->
StringUtils.isBlank(promotion.getBusinessClient())
|| (StringUtils.isNotBlank(businessClient) && Arrays.asList(promotion.getBusinessClient().split(",")).contains(businessClient))).collect(Collectors.toList());
|| Arrays.asList(promotion.getBusinessClient().split(",")).contains(businessClient)).collect(Collectors.toList());
Predicate<PromotionActivityRspBo> predicate = resp->Objects.nonNull(resp.getPromotionTypeEnum());
... ...