yoho-search / yoho-search-service · Commits

Go to a project

Authored by saihide
Commit 83b59ce8320c77bd680da018c440204065d6d592 2 parents 8f0ad6ae ff9ac72d

Merge branch 'master' into recommendbrand

Inline Side-by-side
Showing 1 changed file with 7 additions and 4 deletions
... ... @@ -65,6 +65,9 @@ public class SearchSortHelper {
orderValues.add("pools.id:desc");
orderValues.add("pools.id:asc");
orderValues.add("pools.sort:desc");
orderValues.add("pools.sort:asc");
orderValues.add("brand_weight:asc");
orderValues.add("brand_weight:desc");
... ... @@ -220,11 +223,11 @@ public class SearchSortHelper {
} else if (fieldName.contains("pools")) {
BoolQueryBuilder poolsTermsBuilder = searchCommonHelper.getPoolIdTermsBuilder(paramMap);
String flag = sortOrder.toString().equals("desc") ? "_last" : "_first";
FieldSortBuilder poolsIdSort = SortBuilders.fieldSort(fieldName).order(sortOrder).setNestedPath("pools").missing(flag);
if (poolsTermsBuilder != null) {
poolsIdSort.setNestedFilter(poolsTermsBuilder);
FieldSortBuilder poolsFieldSortBuilder = SortBuilders.fieldSort(fieldName).order(sortOrder).setNestedPath("pools").missing(flag);
if (poolsFieldSortBuilder != null) {
poolsFieldSortBuilder.setNestedFilter(poolsTermsBuilder);
}
sortBuilders.add(poolsIdSort);
sortBuilders.add(poolsFieldSortBuilder);
} else {
this.addSortBuildSorts(sortBuilders, filteredFieldNames, fieldName, sortOrder);
}
... ...