|
|
|
@@ -465,7 +465,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
|
|
|
|
|
|
|
|
private boolean isCouponMerchantValid(Long couponId,TenantEntity tenantEntity) { |
|
|
|
List<WxMerchantVo> merchantVoList = findMerchantListByProduct(tenantEntity,couponId,false); |
|
|
|
List<WxMerchantVo> merchantVoList = findMerchantListByProduct(tenantEntity,couponId,false,false); |
|
|
|
if(merchantVoList == null){ |
|
|
|
return false; |
|
|
|
} |
|
|
|
@@ -1990,7 +1990,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WxMerchantVo> findMerchantListByProduct(TenantEntity tenantEntity,Long productId,boolean hasShop) { |
|
|
|
public List<WxMerchantVo> findMerchantListByProduct(TenantEntity tenantEntity,Long productId,boolean hasShop,boolean isValid) { |
|
|
|
List<Long> merchantIds = wxCouponMerchantMapper.findMerchantIdListByProduct(productId, tenantEntity.getTenantId()); |
|
|
|
Map<Long,WxMerchant> merchantMap = new HashMap<Long,WxMerchant>(); |
|
|
|
Map<Long, List<WxShopVo>> merchantShopVoMap = null; |
|
|
|
@@ -2043,7 +2043,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
WxCouponMerchant cm = couponMerchantList.get(i); |
|
|
|
if (null != cm && null != cm.getMerchantId()) { |
|
|
|
WxMerchant m = merchantMap.get(cm.getMerchantId()); |
|
|
|
if (null != m) { |
|
|
|
if (null != m ) { |
|
|
|
if (isValid) { |
|
|
|
if (m.getIsDel() == EnumYesOrNo.YES.getCode() || m.getStatus() == EnumMerchantStatus.NOT_VALID.getCode()) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
WxMerchantVo vo = new WxMerchantVo(); |
|
|
|
vo.setParameter(cm.getParameter()); |
|
|
|
|
|
|
|
|