Authored by hugufei

Merge branch '0510' into gray

@@ -6,6 +6,6 @@ import java.util.List; @@ -6,6 +6,6 @@ import java.util.List;
6 public class SpecialShopConstants { 6 public class SpecialShopConstants {
7 7
8 public static final List<Integer> DOWNGRADE_SHOPIDS = Arrays.asList(3504); 8 public static final List<Integer> DOWNGRADE_SHOPIDS = Arrays.asList(3504);
9 - public static final float DOWNGRADE_SHOPID_WEIGHT = 0.5f; 9 + public static final float DOWNGRADE_SHOPID_WEIGHT = 0.1f;
10 10
11 } 11 }
@@ -5,6 +5,7 @@ import java.util.Map; @@ -5,6 +5,7 @@ import java.util.Map;
5 5
6 import org.elasticsearch.index.query.QueryBuilder; 6 import org.elasticsearch.index.query.QueryBuilder;
7 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders; 7 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
  8 +import org.elasticsearch.index.query.functionscore.ScriptScoreFunctionBuilder;
8 import org.elasticsearch.script.Script; 9 import org.elasticsearch.script.Script;
9 import org.elasticsearch.script.ScriptType; 10 import org.elasticsearch.script.ScriptType;
10 11