From 207dc8655711cddac2653e18b51e58a88dba2084 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 06 三月 2020 18:14:36 +0800
Subject: [PATCH] 发圈处理

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/HomeRecommendGoodsServiceImpl.java |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/HomeRecommendGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/HomeRecommendGoodsServiceImpl.java
index 0e977a8..fc2a0be 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/HomeRecommendGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/HomeRecommendGoodsServiceImpl.java
@@ -22,7 +22,8 @@
 import com.yeshi.fanli.service.inter.goods.recommend.HomeRecommendGoodsService;
 import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;
 import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
@@ -37,13 +38,16 @@
 	private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;
 
 	@Resource
-	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+	private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
 
 	@Resource
 	private EhCacheCacheManager ehCacheCacheManager;
 
 	@Resource
 	private TLJBuyGoodsService tljBuyGoodsService;
+
+	@Resource
+	private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
 
 	@Override
 	public List<TaoBaoGoodsBrief> listGoodsByPage(Long uid, String device, String imei, String idfa, int page) {
@@ -134,7 +138,7 @@
 		if (fList != null && fList.size() > 0)
 			return fList;
 
-		TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 50, imei, idfa);
+		TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 50, imei, idfa,"");
 		List<TaoBaoGoodsBrief> finalList = new ArrayList<>();
 
 		if (result != null && result.getTaoBaoGoodsBriefs() != null) {
@@ -170,7 +174,16 @@
 		if (fList != null && fList.size() > 0)
 			return fList;
 
-		DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(type, null);
+		DaTaoKeGoodsResult result = null;
+		int count = 0;
+		while (result == null && count < 4) {
+			count++;
+			try {
+				result = DaTaoKeApiUtil.getRankingList(type, null);
+			} catch (Exception e) {
+			}
+		}
+
 		List<DaTaoKeDetailV2> list = result.getGoodsList();
 		List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
 		if (list != null)
@@ -183,6 +196,8 @@
 		if (goodsList != null && goodsList.size() > 0)
 			saveObjList(goodsList, name, key);
 
+		// 鍟嗗搧淇℃伅杩囨护
+		goodsList = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);
 		return goodsList;
 	}
 
@@ -199,9 +214,10 @@
 		if (list != null && list.size() > 0)
 			return list;
 
+		// 鐖嗘鍟嗗搧搴�
 		TaoBaoSearchResult result = TaoKeApiUtil.getMaterialByMaterialId(3756, page, Constant.PAGE_SIZE);
 		if (result != null) {
-			list = daTaoKeGoodsDetailService.filterTaoBaoGoods(result.getTaoBaoGoodsBriefs());
+			list = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(result.getTaoBaoGoodsBriefs());
 			saveObjList(list, name, key);
 			return list;
 		}
@@ -239,20 +255,30 @@
 
 		List<TLJBuyGoods> list = tljBuyGoodsService
 				.listByDay(TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
+
+		if (list.size() > 20)
+			list = list.subList(0, 20);
 		List<TaoBaoGoodsBrief> finalList = new ArrayList<>();
 		Map<Long, TLJBuyGoods> map = new ConcurrentHashMap<>();
 		if (list != null)
 			for (TLJBuyGoods goods : list) {
-				map.put(goods.getGoods().getAuctionId(), goods);
-				finalList.add(goods.getGoods());
+				try {
+					if (goods.getGoods().getAuctionId() == null) {
+						goods.getGoods().setAuctionId(goods.getGoods().getId());
+					}
+					map.put(goods.getGoods().getAuctionId(), goods);
+					finalList.add(goods.getGoods());
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 			}
 
 		finalList = recommendGoodsDeleteHistoryService.filterGoods(device, finalList);
 
 		if (finalList != null && finalList.size() > 0) {
 			Collections.shuffle(finalList);
-			if (finalList.size() >= 3)
-				finalList = finalList.subList(0, 3);
+			if (finalList.size() >= 10)
+				finalList = finalList.subList(0, 10);
 			list = new ArrayList<>();
 			for (TaoBaoGoodsBrief goods : finalList) {
 				list.add(map.get(goods.getAuctionId()));

--
Gitblit v1.8.0