From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/HomeRecommendGoodsServiceImpl.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 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 d13dd2b..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
@@ -23,7 +23,7 @@
 import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;
 import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+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;
@@ -38,7 +38,7 @@
 	private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;
 
 	@Resource
-	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+	private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
 
 	@Resource
 	private EhCacheCacheManager ehCacheCacheManager;
@@ -138,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) {
@@ -215,9 +215,9 @@
 			return list;
 
 		// 鐖嗘鍟嗗搧搴�
-		TaoBaoSearchResult result = TaoKeApiUtil.getMaterialByMaterialId(14624, page, Constant.PAGE_SIZE);
+		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;
 		}
@@ -255,6 +255,9 @@
 
 		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)
@@ -274,8 +277,8 @@
 
 		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