Merge branch 'gray1115' of http://git.yoho.cn/yoho-search/yoho-search-service into gray1115

@@ -47,6 +47,8 @@ public class UfoSearchQueryHelper extends BaseService {
         //商品池
         orderValues.add("pools.id:asc");
         orderValues.add("pools.id:desc");
+        orderValues.add("pools.order_by:asc");
+        orderValues.add("pools.order_by:desc");
 
         //发售时间
         orderValues.add("saleTime:asc");
@@ -84,7 +86,7 @@ public class UfoSearchQueryHelper extends BaseService {
         // 增加商品池相关的过滤条件
         if (paramMap.containsKey("pool") && StringUtils.isNotBlank("pool")) {
             BoolQueryBuilder nestedBoolFilter = QueryBuilders.boolQuery();
-            nestedBoolFilter.must(QueryBuilders.termQuery("pools.pool_id", paramMap.get("pool")));
+            nestedBoolFilter.must(QueryBuilders.termQuery("pools.poolId", paramMap.get("pool")));
             return nestedBoolFilter;
         }
         return null;