|
|
|
@@ -1649,9 +1649,15 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
public List<WxMerchantVo> findMerchantVoList(Long couponId,String city,TenantEntity tenantEntity,boolean hasShop) { |
|
|
|
List<Long> couponIds = new ArrayList<Long>(); |
|
|
|
couponIds.add(couponId); |
|
|
|
TtMerchantPoi poiQ = new TtMerchantPoi(); |
|
|
|
poiQ.setCity(city); |
|
|
|
Map<Long,List<WxMerchantVo>> couponMerchantVoList = findCouponMerchantVoList(couponIds,tenantEntity,poiQ,hasShop); |
|
|
|
List<Long> poiMerchantIds = null; |
|
|
|
if (StringUtils.isNotBlank(city)) { |
|
|
|
TtMerchantPoi poiQ = new TtMerchantPoi(); |
|
|
|
poiQ.setCity(city); |
|
|
|
poiQ.updateTenantInfo(tenantEntity); |
|
|
|
poiMerchantIds = ttMerchantPoiMapper.findIdList(poiQ); |
|
|
|
} |
|
|
|
|
|
|
|
Map<Long,List<WxMerchantVo>> couponMerchantVoList = findCouponMerchantVoList(couponIds,tenantEntity,poiMerchantIds,hasShop); |
|
|
|
if (null != couponMerchantVoList) { |
|
|
|
return couponMerchantVoList.get(couponId); |
|
|
|
} |
|
|
|
|