Merge branch 'release' into f-6.6.5

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

 package com.ctrip.fun.golf.api.product;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -316,14 +317,21 @@ public class AdvertisementMController {
             double minDistance = 0;
             DistrictBean cityBean = new DistrictBean();
             minDistance = MathUtil.GetDistance(BJBean.getLat(), BJBean.getLng(), lat, lng);
+            BigDecimal initDis = new BigDecimal(minDistance);
             for (int i = 0; i < cityList.size(); i++) {
                 cityBean = cityList.get(i);
-                if (minDistance > MathUtil.GetDistance(cityBean.getLat(), cityBean.getLng(), lat,
-                        lng)) {
-                    cityId = cityBean.getId();
+                double distance = MathUtil.GetDistance(cityBean.getLat(), cityBean.getLng(), lat, lng);
+                BigDecimal newDis = new BigDecimal(distance);
+                if(newDis.compareTo(BigDecimal.ZERO)==0){
+                	cityId = cityBean.getId();
+                	break;
+                }else if(initDis.compareTo(newDis)>0){
+                	initDis = newDis;
+                	cityId = cityBean.getId();
                 }
             }
         }
         return cityId;
     }
+    
 }