|
|
|
@@ -1211,8 +1211,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<Long,List<WxMerchantVo>> findCouponMerchantVoList(List<Long> couponIds,TenantEntity tenantEntity,boolean hasShop) { |
|
|
|
Map<Long,List<WxMerchantVo>> retMap = new HashMap<Long,List<WxMerchantVo>>(); |
|
|
|
if (null == couponIds || couponIds.size() <= 0) { |
|
|
|
return null; |
|
|
|
return retMap; |
|
|
|
} |
|
|
|
List<Long> merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(tenantEntity.getTenantId(), couponIds); |
|
|
|
if(null != merchantIds && merchantIds.size() > 0 ) { |
|
|
|
@@ -1236,7 +1237,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
couponMerchantQ.setProductIds(couponIds); |
|
|
|
List<WxCouponMerchant> couponMerchantList = wxCouponMerchantMapper.findList(couponMerchantQ); |
|
|
|
if (null == couponMerchantList) { |
|
|
|
return null; |
|
|
|
return retMap; |
|
|
|
} |
|
|
|
|
|
|
|
Map<Long,List<WxShopVo>> merchantShopVoList = null; |
|
|
|
@@ -1244,7 +1245,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
merchantShopVoList = wxShopService.findMerchantShopVoListMap(tenantEntity,merchantIds); |
|
|
|
} |
|
|
|
|
|
|
|
Map<Long,List<WxMerchantVo>> retMap = new HashMap<Long,List<WxMerchantVo>>(); |
|
|
|
|
|
|
|
for (int i = 0 ; i < couponMerchantList.size() ; i ++) { |
|
|
|
WxCouponMerchant cm = couponMerchantList.get(i); |
|
|
|
Long couponId = cm.getProductId(); |
|
|
|
@@ -1263,7 +1264,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
} |
|
|
|
return retMap; |
|
|
|
} |
|
|
|
return null; |
|
|
|
return retMap; |
|
|
|
} |
|
|
|
|
|
|
|
private WxMerchantVo merchantToVo(WxCouponMerchant cm,WxMerchant m,boolean hasShop,Map<Long,List<WxShopVo>> merchantShopVoList) { |
|
|
|
|