yoho-search / yoho-search-service · Commits

Go to a project

Authored by 胡古飞
Commit d5158e64150be4b78174ed295f2336a58bc103d0 1 parent b271b5ba

fix merger bug

Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
@@ -39,6 +39,7 @@ import com.yoho.search.core.es.model.SearchResult; @@ -39,6 +39,7 @@ import com.yoho.search.core.es.model.SearchResult;
39 import com.yoho.search.service.cache.CacheEnum; 39 import com.yoho.search.service.cache.CacheEnum;
40 import com.yoho.search.service.service.SearchCacheService; 40 import com.yoho.search.service.service.SearchCacheService;
41 import com.yoho.search.service.service.SearchCommonService; 41 import com.yoho.search.service.service.SearchCommonService;
  42 +import com.yoho.search.service.service.base.ProductIndexBaseService;
42 import com.yoho.search.service.service.helper.AggProductListHelper; 43 import com.yoho.search.service.service.helper.AggProductListHelper;
43 import com.yoho.search.service.service.helper.FunctionScoreSearchHelper; 44 import com.yoho.search.service.service.helper.FunctionScoreSearchHelper;
44 import com.yoho.search.service.service.helper.SearchCommonHelper; 45 import com.yoho.search.service.service.helper.SearchCommonHelper;
@@ -67,6 +68,8 @@ public class GoodProductListService implements IGoodProductsService { @@ -67,6 +68,8 @@ public class GoodProductListService implements IGoodProductsService {
67 private SearchCommonHelper searchCommonHelper; 68 private SearchCommonHelper searchCommonHelper;
68 @Autowired 69 @Autowired
69 private FunctionScoreSearchHelper functionScoreSearchHelper; 70 private FunctionScoreSearchHelper functionScoreSearchHelper;
  71 + @Autowired
  72 + private ProductIndexBaseService productIndexBaseService;
70 73
71 @Override 74 @Override
72 public SearchApiResult goodProductList(Map<String, String> paramMap) { 75 public SearchApiResult goodProductList(Map<String, String> paramMap) {
@@ -128,7 +131,7 @@ public class GoodProductListService implements IGoodProductsService { @@ -128,7 +131,7 @@ public class GoodProductListService implements IGoodProductsService {
128 dataMap.put("page", searchResult.getPage()); 131 dataMap.put("page", searchResult.getPage());
129 dataMap.put("page_size", searchParam.getSize()); 132 dataMap.put("page_size", searchParam.getSize());
130 dataMap.put("page_total", searchResult.getTotalPage()); 133 dataMap.put("page_total", searchResult.getTotalPage());
131 - dataMap.put("product_list", searchServiceHelper.getProductMapList(searchResult.getResultList(), Arrays.asList("phrase"))); 134 + dataMap.put("product_list", productIndexBaseService.getProductListWithPricePlan(searchResult.getResultList(), Arrays.asList("phrase")));
132 135
133 // 8)将结果存进缓存 136 // 8)将结果存进缓存
134 searchCacheService.addJSONObjectToCache(cacheEnum, indexName, searchParam, dataMap); 137 searchCacheService.addJSONObjectToCache(cacheEnum, indexName, searchParam, dataMap);