拆包

@@ -3,7 +3,7 @@ package com.yoho.search.restapi.scene;
 import com.yoho.search.aop.downgrade.PersionalRateLimit;
 import com.yoho.search.common.utils.HttpServletRequestUtils;
 import com.yoho.search.models.SearchApiResult;
-import com.yoho.search.service.scene.productlist.FreeShippingOrderPageSceneService;
+import com.yoho.search.service.scene.others.FreeShippingSceneService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,7 +21,7 @@ import java.util.Map;
 public class FreeShippingOrderSceneController {
 
     @Autowired
-    private FreeShippingOrderPageSceneService freeShippingOrderSceneService;
+    private FreeShippingSceneService freeShippingOrderSceneService;
 
     /**
      * 免运费凑单商品列表

-package com.yoho.search.service.scene.productlist;
+package com.yoho.search.service.scene.others;
 
 import com.yoho.search.common.BaseSceneService;
 import com.yoho.search.common.utils.SearchApiResultUtils;
@@ -15,7 +15,7 @@ import java.util.Map;
  * Created by wangnan on 2017/11/21.
  */
 @Service
-public class FreeShippingOrderPageSceneService extends BaseSceneService {
+public class FreeShippingSceneService extends BaseSceneService {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 

-package com.yoho.search.service.scene.productlist.core;
+package com.yoho.search.service.scene.productlist;
 
 import com.yoho.search.common.BaseSceneService;
 import com.yoho.search.common.SearchRequestParams;
@@ -6,7 +6,7 @@ import com.yoho.search.models.SearchApiResult;
 
 import java.util.Map;
 
-public abstract class AbstractPageSceneService extends BaseSceneService {
+abstract class AbstractPageSceneService extends BaseSceneService {
 	
 	protected static final String RECOMMEND_PROMOTION_LIST = "recommend_promotion_list";
 	protected static final String CUSTOMIZE_TAG_LIST = "customize_tag";

@@ -4,7 +4,6 @@ import com.yoho.search.base.utils.SearchPageIdDefine;
 import com.yoho.search.common.utils.SearchApiResultUtils;
 import com.yoho.search.models.SearchApiResult;
 import com.yoho.search.common.SearchRequestParams;
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;

@@ -16,7 +16,6 @@ import com.yoho.search.common.SearchCommonService;
 import com.yoho.search.common.SearchRequestParams;
 import com.yoho.search.service.index.SizeIndexBaseService;
 import com.yoho.search.service.helper.SearchParamHelper;
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;

@@ -4,7 +4,6 @@ import com.google.common.base.Splitter;
 import com.yoho.search.base.utils.SearchPageIdDefine;
 import com.yoho.search.common.utils.SearchApiResultUtils;
 import com.yoho.search.models.SearchApiResult;
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.sknimg.SknImgsResponse;
 import com.yoho.search.common.SearchRequestParams;
 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;

@@ -3,7 +3,6 @@ package com.yoho.search.service.scene.productlist;
 import com.yoho.search.base.utils.SearchPageIdDefine;
 import com.yoho.search.common.utils.SearchApiResultUtils;
 import com.yoho.search.models.SearchApiResult;
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;

@@ -8,7 +8,6 @@ import com.yoho.search.common.SearchDynamicConfigService;
 import com.yoho.search.common.SearchRequestParams;
 import com.yoho.search.service.helper.SearchCommonHelper;
 import com.yoho.search.service.helper.SearchKeyWordHelper;
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
 import com.yoho.search.service.scene.productlist.selections.SceneAggregationsHelper;
 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;

@@ -7,7 +7,6 @@ import com.yoho.search.models.SearchApiResult;
 import com.yoho.search.common.SearchRequestParams;
 import com.yoho.search.service.helper.SearchCommonHelper;
 import com.yoho.search.service.helper.SearchKeyWordHelper;
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;

@@ -4,7 +4,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
 import org.slf4j.Logger;

@@ -2,7 +2,6 @@ package com.yoho.search.service.scene.productlist;
 
 import java.util.Map;
 
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
 import org.apache.commons.lang.StringUtils;

@@ -4,7 +4,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -3,7 +3,6 @@ package com.yoho.search.service.scene.productlist;
 import java.util.List;
 import java.util.Map;
 
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
 import org.apache.commons.lang3.StringUtils;

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.yoho.search.base.utils.SearchPageIdDefine;
 import com.yoho.search.models.SearchApiResult;
 import com.yoho.search.common.SearchRequestParams;
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.productlist.core.ProductListSwitchService;
 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
 import com.yoho.search.service.scene.productlist.selections.SceneAggregationsHelper;

@@ -2,7 +2,6 @@ package com.yoho.search.service.scene.productlist;
 
 import java.util.Map;
 
-import com.yoho.search.service.scene.productlist.core.AbstractPageSceneService;
 import com.yoho.search.service.scene.productlist.selections.SceneRecommendBrandsService;
 import com.yoho.search.service.scene.productlist.selections.SceneSelectionsService;
 import org.apache.commons.lang.StringUtils;