From aa66729ef758105dc1ced739ffe88e253affc37a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 15:49:28 +0800
Subject: [PATCH] Merge branch 'master-bug'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 257ec87..5a9d0c2 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,16 @@
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;
}
+
List<SuperHotSearch> superHotSearchList = superHotSearchSerivce
- .getSuperHotSearchBySystemIdCache(system.getId());
+ .getSuperHotSearchBySystemIdCache(system.getId(), goodsType);
if (superHotSearchList == null || superHotSearchList.size() == 0) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏁版嵁"));
return;
--
Gitblit v1.8.0