|
|
@@ -1064,10 +1064,13 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
result.setStorePositionLatitude(result.getStorePosition().split(",")[1]);
|
|
|
// 设置距离
|
|
|
if ((jingdu != null && !jingdu.isEmpty()) && (weidu != null && !weidu.isEmpty())) {
|
|
|
- double storeJing = Double.parseDouble(result.getStorePosition().split(",")[0]);
|
|
|
+ /*double storeJing = Double.parseDouble(result.getStorePosition().split(",")[0]);
|
|
|
double storeWei = Double.parseDouble(result.getStorePosition().split(",")[1]);
|
|
|
- double storeDistance = DistanceUtil.haversineCalculateDistance(Double.parseDouble(jingdu), Double.parseDouble(weidu), storeJing, storeWei);
|
|
|
- result.setDistance(storeDistance);
|
|
|
+ double storeDistance = DistanceUtil.haversineCalculateDistance(Double.parseDouble(jingdu), Double.parseDouble(weidu), storeJing, storeWei);*/
|
|
|
+
|
|
|
+ Double distance = storeInfoMapper.getStoreDistance(jingdu + "," + weidu,result.getId());
|
|
|
+
|
|
|
+ result.setDistance(distance);
|
|
|
}
|
|
|
// 计算店铺到最近地铁站的距离
|
|
|
JSONObject nearbySubway = gaoDeMapUtil.getNearbySubway(result.getStorePosition().split(",")[0], result.getStorePosition().split(",")[1]);
|