From f617136cba7f851a32f6091d5adc3e80f0e224c2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 一月 2019 09:33:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |  152 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 139 insertions(+), 13 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 c5ef4fa..7838008 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
@@ -7,6 +7,8 @@
 import java.util.List;
 import java.util.Map;
 
+import org.yeshi.utils.taobao.TbImgUtil;
+
 import com.taobao.api.ApiException;
 import com.yeshi.fanli.entity.taobao.RelateGoods;
 import com.yeshi.fanli.entity.taobao.SearchFilter;
@@ -24,7 +26,6 @@
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
-import org.yeshi.utils.taobao.TbImgUtil;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -157,6 +158,7 @@
 		map.put("method", "taobao.tbk.item.info.get");
 		map.put("num_iids", id + "");
 		String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
+		// System.out.println(resultStr);
 		JSONObject data = JSONObject.fromObject(resultStr);
 		// 鍟嗗搧涓嬫灦
 		if (data.optJSONObject("error_response") != null && data.optJSONObject("error_response").optInt("code") == 15
@@ -192,6 +194,7 @@
 			goods.setProvcity(item.optString("provcity"));
 			goods.setPictUrl(item.optString("pict_url"));
 			goods.setShopTitle(item.optString("nick"));
+			goods.setSellerId(item.optLong("seller_id"));
 
 			String optString = item.optString("shop_dsr");
 			if (!StringUtil.isNullOrEmpty(optString)) {
@@ -218,9 +221,29 @@
 			if (item.optBoolean("free_shipment"))
 				goods.setFreeShipment(1);
 
+			System.out.println(item.optString("material_lib_type"));
+
 			return goods;
 		}
 		return null;
+	}
+
+	public static List<TaoBaoGoodsBrief> getBatchGoodsInfo(List<Long> listId)
+			throws TaoKeApiException, TaobaoGoodsDownException {
+		if (listId == null || listId.size() == 0) {
+			throw new TaobaoGoodsDownException(1, "娣樺疂鍟嗗搧ID涓嶈兘涓虹┖");
+		}
+
+		if (listId.size() > 40) {
+			throw new TaobaoGoodsDownException(1, "娣樺疂鍟嗗搧ID涓嶈兘瓒呰繃40涓�");
+		}
+
+		StringBuffer ids = new StringBuffer();
+		for (Long id : listId) {
+			ids.append(id + ",");
+		}
+
+		return getBatchGoodsInfos(ids.substring(0, ids.length() - 1));
 	}
 
 	/**
@@ -301,8 +324,11 @@
 					goods.setPayRate30(1);
 
 				if (item.optBoolean("free_shipment"))
-					goods.setFreeShipment(1);
+					goods.setFreeShipment(1);
 
+				if ("1".equalsIgnoreCase(item.optString("material_lib_type")))
+					;
+
 				goodsList.add(goods);
 			}
 		}
@@ -626,7 +652,6 @@
 
 		if (filter.getEndTkRate() > 0)
 			map.put("end_tk_rate", filter.getEndTkRate() + "");
-		
 
 		if (filter.getStartKaTkRate() > 0)
 			map.put("start_ka_tk_rate", filter.getStartKaTkRate() + "");
@@ -867,10 +892,16 @@
 	private static TaoBaoGoodsBrief parseWuLiaoItem(JSONObject item) {
 		TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
 		goods.setPictUrl(item.optString("pict_url"));
+		
+		if (!StringUtil.isNullOrEmpty(item.optString("white_image"))) {
+			goods.setPictUrlWhite(item.optString("white_image"));
+		}
+		
 		goods.setAuctionId(item.optLong("num_iid"));
 		goods.setAuctionUrl("https:" + item.optString("url"));
 		goods.setBiz30day(item.optInt("volume"));
 		goods.setCouponInfo(item.optString("coupon_info"));
+		
 		if (goods.getCouponInfo() != null)
 			goods.setCouponInfo(goods.getCouponInfo().replace(".00", ""));
 
@@ -960,6 +991,11 @@
 	 * @return
 	 */
 	public static String getTKToken(String logo, String text, String url) {
+		if (text == null)
+			return null;
+		if (text.length() < 5)
+			text = "濂借揣锛�" + text;
+
 		Map<String, String> map = new HashMap<>();
 		map.put("method", "taobao.tbk.tpwd.create");
 		map.put("url", url);
@@ -1040,16 +1076,17 @@
 				return list;
 			JSONArray array = data.optJSONObject("tbk_item_recommend_get_response").optJSONObject("results")
 					.optJSONArray("n_tbk_item");
-			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"));
-				list.add(goods);
-			}
+			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"));
+					list.add(goods);
+				}
 		}
 		return list;
 	}
@@ -1410,6 +1447,95 @@
 		return result;
 	}
 
+	/**
+	 * 浠庢窐瀹濋摼鎺ヤ腑瑙f瀽鍟嗗搧ID锛堥珮绾ф帴鍙o級
+	 * 
+	 * @param link
+	 * @return
+	 */
+	public static String parseAuctionIdFromLink(String link) {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.item.click.extract");
+		map.put("click_url", link + "");
+		JSONObject resultJSON = null;
+		try {
+			resultJSON = TaoKeBaseUtil.baseRequest(map, true);
+		} catch (TaoKeApiException e) {
+			e.printStackTrace();
+		}
+		if (resultJSON == null)
+			return null;
+
+		return null;
+
+	}
+
+	public static String getAccessToken(String code, String appKey, String appSecret) {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.top.auth.token.create");
+		map.put("code", code);
+		TaoKeAppInfo app = new TaoKeAppInfo();
+		app.setAppKey(appKey);
+		app.setAppSecret(appSecret);
+		try {
+			JSONObject json = TaoKeBaseUtil.baseRequest(map, app);
+			if (json != null)
+				return json.toString();
+		} catch (TaoKeApiException e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
+	/**
+	 * 娓犻亾閭�璇风爜
+	 * 
+	 * @param relationId
+	 * @return
+	 */
+	public static String getInviteCode(Long relationId, String accessToken, String appKey, String appSecret) {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.sc.invitecode.get");
+		map.put("session", accessToken);
+		map.put("code_type", "1");
+		map.put("relation_app", "common");
+		JSONObject resultJSON = null;
+		try {
+			TaoKeAppInfo app = new TaoKeAppInfo();
+			app.setAppKey(appKey);
+			app.setAppSecret(appSecret);
+			resultJSON = TaoKeBaseUtil.baseRequest(map, app);
+		} catch (TaoKeApiException e) {
+			e.printStackTrace();
+		}
+		if (resultJSON == null)
+			return null;
+
+		return null;
+	}
+
+	public static String beiAnQuDao(Long relationId, String accessToken, String appKey, String appSecret) {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.sc.publisher.info.save");
+		map.put("session", accessToken);
+		map.put("inviter_code", "A2QnGL");
+		map.put("info_type", "1");
+		JSONObject resultJSON = null;
+		try {
+			TaoKeAppInfo app = new TaoKeAppInfo();
+			app.setAppKey(appKey);
+			app.setAppSecret(appSecret);
+			resultJSON = TaoKeBaseUtil.baseRequest(map, app);
+		} catch (TaoKeApiException e) {
+			e.printStackTrace();
+		}
+		if (resultJSON == null)
+			return null;
+
+		return null;
+	}
+
 	private static TaoBaoGoodsBrief parseWuLiaoItemFromMaterialId(JSONObject item) {
 		TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
 		// 璁剧疆鎴�320*320鐨勫浘鐗囧昂瀵�

--
Gitblit v1.8.0