From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |   92 ++++++++++++++++------------------------------
 1 files changed, 32 insertions(+), 60 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index 91125f1..4865c22 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -9,11 +9,9 @@
 
 import org.yeshi.utils.taobao.TbImgUtil;
 
-import com.taobao.api.ApiException;
 import com.yeshi.fanli.dto.taobao.TaoBaoShopInfoDTO;
 import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;
 import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport;
-import com.yeshi.fanli.entity.taobao.RelateGoods;
 import com.yeshi.fanli.entity.taobao.SearchFilter;
 import com.yeshi.fanli.entity.taobao.SearchShopFilter;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -950,23 +948,6 @@
 		return null;
 	}
 
-	public static List<RelateGoods> getRelateGoodsList(long auctionId) throws ApiException {
-		List<RelateGoods> resultList = new ArrayList<>();
-		List<TaoBaoGoodsBrief> list = getRelationGoodsRecommend(auctionId, 9);
-		for (TaoBaoGoodsBrief goods : list) {
-			if (goods != null) {
-				RelateGoods rg = new RelateGoods();
-				rg.setId(goods.getAuctionId() + "");
-				rg.setPicUrl(goods.getPictUrl());
-				rg.setTitle(goods.getTitle());
-				rg.setZkPrice(goods.getZkPrice().toString());
-				rg.setUrl(goods.getAuctionUrl());
-				resultList.add(rg);
-			}
-		}
-		return resultList;
-	}
-
 	/**
 	 * 鑾峰彇鍒歌缁嗕俊鎭�
 	 * 
@@ -993,45 +974,6 @@
 		} else
 			return null;
 		return info;
-	}
-
-	/**
-	 * 鑾峰彇鍏宠仈鍟嗗搧鎺ㄨ崘
-	 * 
-	 * @param auctionId
-	 * @return
-	 */
-	public static List<TaoBaoGoodsBrief> getRelationGoodsRecommend(long auctionId, int count) {
-		List<TaoBaoGoodsBrief> list = new ArrayList<>();
-		Map<String, String> map = new HashMap<>();
-		map.put("method", "taobao.tbk.item.recommend.get");
-		map.put("num_iid", auctionId + "");
-		map.put("count", count + "");
-		map.put("platform", 2 + "");
-		map.put("fields",
-				"num_iid,title,pict_url,small_images,reserve_price,zk_final_price,user_type,provcity,item_url");
-		String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
-		JSONObject data = JSONObject.fromObject(resultStr);
-		if (data.optJSONObject("tbk_item_recommend_get_response") != null) {
-			if (data.optJSONObject("tbk_item_recommend_get_response").optJSONObject("results") == null)
-				return list;
-			JSONArray array = data.optJSONObject("tbk_item_recommend_get_response").optJSONObject("results")
-					.optJSONArray("n_tbk_item");
-			if (array != null)
-				for (int i = 0; i < array.size(); i++) {
-					JSONObject item = array.optJSONObject(i);
-					TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
-					goods.setAuctionId(item.optLong("num_iid"));
-					goods.setTitle(item.optString("title"));
-					goods.setZkPrice(new BigDecimal(item.optString("zk_final_price")));
-					goods.setAuctionUrl(item.optString("item_url"));
-					goods.setPictUrl(item.optString("pict_url"));
-					goods.setSalesCount(item.optString("volume"));
-					goods.setUserType(item.optInt("user_type"));
-					list.add(goods);
-				}
-		}
-		return list;
 	}
 
 	public static void taoQiangGou() {
@@ -1334,14 +1276,12 @@
 		if (response != null && response.optJSONObject("result_list") != null) {
 			JSONArray array = response.optJSONObject("result_list").optJSONArray("map_data");
 			if (array != null) {
-
 				for (int i = 0; i < array.size(); i++) {
 					JSONObject item = array.optJSONObject(i);
 					TaoBaoGoodsBrief goods = parseWuLiaoItemFromMaterialId(item);
 					if (goods != null)
 						goodsList.add(goods);
 				}
-
 				pageSize = array.size();
 			}
 		}
@@ -2110,6 +2050,38 @@
 		return null;
 	}
 
+	public static List<TaoBaoGoodsBrief> guessLikeByAuctionId(Long auctionId,int count) {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.dg.optimus.material");
+		map.put("item_id", auctionId + "");
+		map.put("page_size", count + "");
+		map.put("page_no", 1 + "");
+		map.put("material_id", 13256 + "");
+
+		List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+		JSONObject resultJSON = null;
+		try {
+			resultJSON = TaoKeBaseUtil.baseRequest(map, true);
+
+			JSONObject response = resultJSON.optJSONObject("tbk_dg_optimus_material_response");
+			if (response != null && response.optJSONObject("result_list") != null) {
+				JSONArray array = response.optJSONObject("result_list").optJSONArray("map_data");
+				if (array != null) {
+
+					for (int i = 0; i < array.size(); i++) {
+						JSONObject item = array.optJSONObject(i);
+						TaoBaoGoodsBrief goods = parseWuLiaoItemFromMaterialId(item);
+						if (goods != null)
+							goodsList.add(goods);
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return goodsList;
+	}
 }
 
 class QuanInfo {

--
Gitblit v1.8.0