yoho-search / yoho-search-service · Commits

Go to a project

Authored by hugufei
Commit 1229b3b8c0706159c482d3b9693d7519a980491b 2 parents e3c4983c 27b7b0b6

Merge branch 'master' into wn_FreeShippingCouponsPool

Inline Side-by-side
Showing 1 changed file with 14 additions and 24 deletions
1 package com.yoho.search.service.scene; 1 package com.yoho.search.service.scene;
2 2
3 -import java.util.Map;  
4 -import java.util.concurrent.CompletableFuture;  
5 -import java.util.concurrent.ExecutorService;  
6 -import java.util.concurrent.Executors;  
7 -  
8 -import org.apache.commons.lang.StringUtils;  
9 -import org.slf4j.Logger;  
10 -import org.slf4j.LoggerFactory;  
11 -import org.springframework.beans.factory.annotation.Autowired;  
12 -import org.springframework.stereotype.Service;  
13 -  
14 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
15 import com.yoho.search.base.utils.SearchPageIdDefine; 4 import com.yoho.search.base.utils.SearchPageIdDefine;
16 import com.yoho.search.models.SearchApiResult; 5 import com.yoho.search.models.SearchApiResult;
@@ -22,8 +11,16 @@ import com.yoho.search.service.scene.common.AbstractSceneService; @@ -22,8 +11,16 @@ import com.yoho.search.service.scene.common.AbstractSceneService;
22 import com.yoho.search.service.scene.common.CommonSceneProductListService; 11 import com.yoho.search.service.scene.common.CommonSceneProductListService;
23 import com.yoho.search.service.scene.common.SceneSelectionsService; 12 import com.yoho.search.service.scene.common.SceneSelectionsService;
24 import com.yoho.search.service.scene.recall.SortRecallSceneService; 13 import com.yoho.search.service.scene.recall.SortRecallSceneService;
25 -import com.yoho.search.service.service.IAggRecommendService;  
26 -import com.yoho.search.service.service.IProductIndexService; 14 +import org.apache.commons.lang.StringUtils;
  15 +import org.slf4j.Logger;
  16 +import org.slf4j.LoggerFactory;
  17 +import org.springframework.beans.factory.annotation.Autowired;
  18 +import org.springframework.stereotype.Service;
  19 +
  20 +import java.util.Map;
  21 +import java.util.concurrent.CompletableFuture;
  22 +import java.util.concurrent.ExecutorService;
  23 +import java.util.concurrent.Executors;
27 24
28 @Service 25 @Service
29 public class SortSceneService extends AbstractSceneService { 26 public class SortSceneService extends AbstractSceneService {
@@ -37,10 +34,6 @@ public class SortSceneService extends AbstractSceneService { @@ -37,10 +34,6 @@ public class SortSceneService extends AbstractSceneService {
37 @Autowired 34 @Autowired
38 private SearchCommonHelper searchCommonHelper; 35 private SearchCommonHelper searchCommonHelper;
39 @Autowired 36 @Autowired
40 - private IProductIndexService productIndexService;  
41 - @Autowired  
42 - private IAggRecommendService aggRecommendService;  
43 - @Autowired  
44 private SortRecallSceneService sortRecallSceneService; 37 private SortRecallSceneService sortRecallSceneService;
45 @Autowired 38 @Autowired
46 private SearchDynamicConfigService searchDynamicConfigService; 39 private SearchDynamicConfigService searchDynamicConfigService;
@@ -127,13 +120,10 @@ public class SortSceneService extends AbstractSceneService { @@ -127,13 +120,10 @@ public class SortSceneService extends AbstractSceneService {
127 if (!searchCommonHelper.isOrderEmpty(paramMap)) { 120 if (!searchCommonHelper.isOrderEmpty(paramMap)) {
128 return false; 121 return false;
129 } 122 }
130 - // int uid = searchCommonHelper.getUid(paramMap);  
131 - // if (uid <= 0) {  
132 - // return false;  
133 - // }  
134 - // if (!searchDynamicConfigService.isGoToSortRecallUser(uid)) {  
135 - // return false;  
136 - // } 123 + int uid = searchCommonHelper.getUid(paramMap);
  124 + if (uid <= 0) {
  125 + return false;
  126 + }
137 return true; 127 return true;
138 } 128 }
139 129