Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-golf-mobile into f-6.7.0

src/main/java/com/ctrip/fun/golf/api/product/AdvertisementMController.java

@@ -319,11 +319,11 @@ public class AdvertisementMController {
             double minDistance = 0;
             double minDistance = 0;
             DistrictBean cityBean = new DistrictBean();
             DistrictBean cityBean = new DistrictBean();
             minDistance = MathUtil.GetDistance(BJBean.getLat(), BJBean.getLng(), lat, lng);
             minDistance = MathUtil.GetDistance(BJBean.getLat(), BJBean.getLng(), lat, lng);
-            BigDecimal initDis = new BigDecimal(minDistance);
+            BigDecimal initDis = new BigDecimal(minDistance).setScale(4, BigDecimal.ROUND_HALF_UP);
             for (int i = 0; i < cityList.size(); i++) {
             for (int i = 0; i < cityList.size(); i++) {
                 cityBean = cityList.get(i);
                 cityBean = cityList.get(i);
                 double distance = MathUtil.GetDistance(cityBean.getLat(), cityBean.getLng(), lat, lng);
                 double distance = MathUtil.GetDistance(cityBean.getLat(), cityBean.getLng(), lat, lng);
-                BigDecimal newDis = new BigDecimal(distance);
+                BigDecimal newDis = new BigDecimal(distance).setScale(4, BigDecimal.ROUND_HALF_UP);
                 if(newDis.compareTo(BigDecimal.ZERO)==0){
                 if(newDis.compareTo(BigDecimal.ZERO)==0){
                 	cityId = cityBean.getId();
                 	cityId = cityBean.getId();
                 	break;
                 	break;