Authored by hugufei

Merge branch 'master_hotfix' into dev

... ... @@ -34,7 +34,7 @@ public class BrandAggregation extends AbstractAggregation{
@Override
public AbstractAggregationBuilder getBuilder() {
//return AggregationBuilders.terms(aggName()).field("brandId").size(1000);
return AggregationBuilders.terms(aggName()).field("brandId").size(1000);
return AggregationBuilders.terms(aggName()).field("brandId").size(500);
}
@Override
... ...
... ... @@ -199,11 +199,11 @@ public class SearchProductsServiceNew {
@SuppressWarnings("unchecked")
private Map<String, Object> buildFilterResult(Map<String, Object> aggregationResult, Map<String, String> paramMap) throws Exception {
Map<String, Object> filter = new HashMap<String, Object>();
// 1)获取年龄的聚合结果
Object ageLevelAgg = aggregationResult.get("ageLevelAgg");
if (ageLevelAgg != null) {
filter.put("ageLevel", ageLevelAgg);
}
// // 1)获取年龄的聚合结果
// Object ageLevelAgg = aggregationResult.get("ageLevelAgg");
// if (ageLevelAgg != null) {
// filter.put("ageLevel", ageLevelAgg);
// }
// 2)获取性别的聚合结果
Object genderAgg = aggregationResult.get("genderAgg");
if (genderAgg != null) {
... ...