From f4548a3ee46afe45da4ee2a42dc169c575deee9f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 31 七月 2019 11:57:36 +0800
Subject: [PATCH] 动态v2兼容

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
index 609dee9..7a79777 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java
@@ -15,7 +15,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.taobao.TaoBaoAuthUtil;
 import org.yeshi.utils.taobao.TbImgUtil;
 
 import com.google.gson.Gson;
@@ -99,15 +98,21 @@
 	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
 
 	@RequestMapping(value = "gethotsearch", method = RequestMethod.POST)
-	public void getHotSearch(AcceptData acceptData, PrintWriter out) {
+	public void getHotSearch(AcceptData acceptData, Integer goodsType, PrintWriter out) {
 		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
 				acceptData.getPackages());
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
 			return;
 		}
+		
+		// 榛樿娣樺疂
+		if (goodsType == null) {
+			goodsType = Constant.SOURCE_TYPE_TAOBAO;
+		}
+		
 		List<SuperHotSearch> superHotSearchList = superHotSearchSerivce
-				.getSuperHotSearchBySystemIdCache(system.getId());
+				.getSuperHotSearchBySystemIdCache(system.getId(), goodsType);
 		if (superHotSearchList == null || superHotSearchList.size() == 0) {
 			out.print(JsonUtil.loadFalseResult("娌℃湁鏁版嵁"));
 			return;
@@ -482,7 +487,7 @@
 				listRecommendWords = new ArrayList<String>();
 			}
 
-			List<TaoBaoShopVO> listShop =null; //taoBaoShopService.getShopByKey(kw);
+			List<TaoBaoShopVO> listShop =taoBaoShopService.getShopByKey(kw);
 			if (listShop != null && listShop.size() > 0 && listShop.get(0).getListGoods() != null
 					&& listShop.get(0).getListGoods().size() > 2) {
 				data.put("shop", JsonUtil.getApiCommonGson().toJson(listShop.get(0)));

--
Gitblit v1.8.0