|
|
|
@@ -212,15 +212,7 @@ public class WxCouponController extends BaseController { |
|
|
|
|
|
|
|
List<WxMerchantVo> volist = CouponCacheUtils.getCouponMerchantCache(redisTemplate, couponChannel.getId()); |
|
|
|
if (null == volist) { |
|
|
|
List<Long> couponIdList = new ArrayList<Long>(); |
|
|
|
couponIdList.add(couponChannel.getCouponId()); |
|
|
|
Map<Long, List<WxMerchantVo>> couponMerchantVoMap = merchantService.findCouponMerchantVoList(couponIdList, couponChannel,true); |
|
|
|
volist = couponMerchantVoMap.get(couponChannel.getCouponId()); |
|
|
|
if (volist != null) { |
|
|
|
volist = volist.stream().filter( |
|
|
|
m->m.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
} |
|
|
|
volist = couponService.getCouponMerchantList(getTenantInfo(), couponChannel.getCouponId()); |
|
|
|
if (null != volist && volist.size() > 0 ) { |
|
|
|
CouponCacheUtils.setCouponMerchantCache(redisTemplate, couponChannel.getCouponId(), volist); |
|
|
|
} |
|
|
|
|