From d3a9feeeee6f70462d12e48db5fd1cab9b183bc8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 17:14:54 +0800
Subject: [PATCH] 更改goodsType
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SearchController.java | 53 ++++++++++++++++++++++++-----------------------------
1 files changed, 24 insertions(+), 29 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..4e961a7 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;
@@ -25,7 +24,6 @@
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.recommend.Honest;
import com.yeshi.fanli.entity.bus.search.HotSearch;
-import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.SearchFilter;
@@ -39,10 +37,10 @@
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.config.HotSearchService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
@@ -72,10 +70,10 @@
private ConfigService configService;
@Resource
- private SuperHotSearchService superHotSearchSerivce;
-
+ private HotSearchService hotSearchService;
+
@Resource
- private HistorySearchService historySearchService;
+ private HistorySearchService historySearchService;
@Resource
private HongBaoManageService manageService;
@@ -98,33 +96,30 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+
+ /**
+ * 鐑棬鎼滅储
+ * @param acceptData
+ * @param goodsType
+ * @param out
+ */
@RequestMapping(value = "gethotsearch", method = RequestMethod.POST)
- public void getHotSearch(AcceptData acceptData, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
- return;
+ public void getHotSearch(AcceptData acceptData, Integer goodsType, PrintWriter out) {
+ // 榛樿娣樺疂
+ if (goodsType == null) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
- List<SuperHotSearch> superHotSearchList = superHotSearchSerivce
- .getSuperHotSearchBySystemIdCache(system.getId());
- if (superHotSearchList == null || superHotSearchList.size() == 0) {
+
+ List<HotSearch> list = hotSearchService.getHotSearchCache(goodsType);
+ if (list == null || list.size() == 0) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏁版嵁"));
return;
}
- List<HotSearch> hotSearchList = new ArrayList<HotSearch>();
- for (SuperHotSearch superHotSearch : superHotSearchList) {
- HotSearch hotSearch = superHotSearch.getHotSearch();
- if (hotSearch != null)
- hotSearchList.add(hotSearch);
- }
-
+
JSONObject data = new JSONObject();
- data.put("count", hotSearchList.size());
- data.put("hotSearchList", hotSearchList);
- String result = JsonUtil.loadTrueResult(data);
- out.print(result);
- return;
+ data.put("count", list.size());
+ data.put("hotSearchList", list);
+ out.print(JsonUtil.loadTrueResult(data));
}
@RequestMapping("specialSearch")
@@ -482,7 +477,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