|
|
|
@@ -1225,7 +1225,21 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
} |
|
|
|
List<Long> merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(tenantEntity.getTenantId(), couponIds); |
|
|
|
if(null != merchantIds && merchantIds.size() > 0 ) { |
|
|
|
WxMerchant merchantQ = new WxMerchant(); |
|
|
|
TtMerchantPoi poiQ = new TtMerchantPoi(); |
|
|
|
poiQ.updateTenantInfo(tenantEntity); |
|
|
|
poiQ.setIds(merchantIds); |
|
|
|
List<TtMerchantPoi> poiList = ttMerchantPoiMapper.findList(poiQ); |
|
|
|
Map<Long,TtMerchantPoi> poiMap = new HashMap<Long,TtMerchantPoi>(); |
|
|
|
if(null != poiList){ |
|
|
|
for (int i = 0 ; i < poiList.size() ; i++) { |
|
|
|
TtMerchantPoi p = poiList.get(i); |
|
|
|
if (null != p) { |
|
|
|
poiMap.put(p.getId(), p); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
WxMerchant merchantQ = new WxMerchant(); |
|
|
|
merchantQ.updateTenantInfo(tenantEntity); |
|
|
|
merchantQ.setIds(merchantIds); |
|
|
|
List<WxMerchant> merchantList = wxMerchantMapper.findList(merchantQ); |
|
|
|
@@ -1234,7 +1248,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
for (int i = 0 ; i < merchantList.size() ; i++) { |
|
|
|
WxMerchant m = merchantList.get(i); |
|
|
|
if (null != m) { |
|
|
|
merchantMap.put(m.getId(), m); |
|
|
|
TtMerchantPoi poi = poiMap.get(m.getId()); |
|
|
|
if(null != poi){ |
|
|
|
m.setLongitude(poi.getLongitude()); |
|
|
|
m.setLatitude(poi.getLatitude()); |
|
|
|
} |
|
|
|
merchantMap.put(m.getId(), m); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -1297,6 +1316,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
if (hasShop && null != merchantShopVoList) { |
|
|
|
vo.setShopVoList(merchantShopVoList.get(vo.getId())); |
|
|
|
} |
|
|
|
vo.setLongitude(m.getLongitude()); |
|
|
|
vo.setLatitude(m.getLatitude()); |
|
|
|
return vo; |
|
|
|
} |
|
|
|
|
|
|
|
|