diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy index ad3537664..8eedfcae0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy @@ -5831,7 +5831,7 @@ class CommonDatautils { "must": [ { "geo_distance": { - "distance": "1km", + "distance": "${distance}", "location": { "lat": ${lat}, "lon": ${lng} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy index 4f61afd3a..211a4ccb5 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy @@ -285,6 +285,12 @@ class CZDataBatch extends BaseBatch{ def getRentPrice(def city, def lng, def lat){ def p_date = DateUtils.formatDateByPattern(DateUtil.add(new Date(), -365),'yyyy-MM-dd') def rets = CommonDatautils.findSeawater(city, lng, lat, "1km", p_date, "shop_rent") + if(!rets){ + rets = CommonDatautils.findSeawater(city, lng, lat, "2km", p_date, "shop_rent") + if(!rets){ + rets = CommonDatautils.findSeawater(city, lng, lat, "3km", p_date, "shop_rent") + } + } if(rets){ def prices = [] for(def r : rets){