From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java
index c09169f..c0e0e5c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java
@@ -10,7 +10,6 @@
import java.util.Set;
import javax.annotation.Resource;
-import javax.print.attribute.standard.NumberUp;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Controller;
@@ -24,7 +23,6 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.recommend.Honest;
-import com.yeshi.fanli.entity.bus.search.HistorySearch;
import com.yeshi.fanli.entity.bus.search.HotSearch;
import com.yeshi.fanli.entity.bus.su.search.SuperHotSearch;
import com.yeshi.fanli.entity.system.BusinessSystem;
@@ -36,6 +34,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -44,10 +43,14 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.service.inter.user.HistorySearchService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.EhcacheUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
+import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
import com.yeshi.fanli.util.taobao.SearchFilterUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -84,6 +87,12 @@
@Resource
private QualityGoodsService qualityGoodsService;
+ @Resource
+ private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;
+
+ @Resource
+ private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+
@RequestMapping(value = "gethotsearch", method = RequestMethod.POST)
public void getHotSearch(AcceptData acceptData, PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
@@ -101,7 +110,8 @@
List<HotSearch> hotSearchList = new ArrayList<HotSearch>();
for (SuperHotSearch superHotSearch : superHotSearchList) {
HotSearch hotSearch = superHotSearch.getHotSearch();
- hotSearchList.add(hotSearch);
+ if (hotSearch != null)
+ hotSearchList.add(hotSearch);
}
JSONObject data = new JSONObject();
@@ -597,6 +607,21 @@
}
TaoBaoSearchResult result = TaoBaoUtil.search(sf);
+ // 澶ф窐瀹㈣繃婊�
+ List<DaTaoKeDetail> detaokeList = daTaoKeGoodsDetailService.listByDtitle(kw);
+ if (detaokeList != null)
+ for (DaTaoKeDetail detail : detaokeList) {
+ for (int i = 0; i < result.getTaoBaoGoodsBriefs().size(); i++) {
+ if (detail.getGoodsId().longValue() == result.getTaoBaoGoodsBriefs().get(i).getAuctionId()) {
+ result.getTaoBaoGoodsBriefs().set(i,
+ DaTaoKeUtil.filterTaoBaoGoods(result.getTaoBaoGoodsBriefs().get(i), detail));
+ break;
+ }
+ }
+ }
+
+ // result.setTaoBaoGoodsBriefs(daTaoKeGoodsDetailService.filterTaoBaoGoods(result.getTaoBaoGoodsBriefs()));
+
if (result == null) {
return null;
}
@@ -615,9 +640,19 @@
map.put(g.getAuctionId(), g.getMaterialLibType());
for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs())
goods.setMaterialLibType(map.get(goods.getAuctionId()));
+
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ // 鏇存柊鍒扮珐瀛�
+ for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs())
+ taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(goods);
+ }
+ });
} catch (TaobaoGoodsDownException e) {
e.printStackTrace();
}
+
}
List<TaoBaoSearchNav> navList = TaoBaoUtil.getBaseNav();
--
Gitblit v1.8.0