From 23f7b250c00597ad89282075460a4c27dffe1ada Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:39:06 +0800
Subject: [PATCH] Merge branch 'dev-msg'

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 3 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 30b5e1b..043a5f9 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
@@ -25,6 +25,7 @@
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
 
+import org.fanli.TaoKeTest;
 import org.yeshi.utils.taobao.TbImgUtil;
 
 import net.sf.json.JSONArray;
@@ -158,6 +159,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
@@ -219,6 +221,8 @@
 
 			if (item.optBoolean("free_shipment"))
 				goods.setFreeShipment(1);
+			
+			System.out.println(item.optString("material_lib_type"));
 
 			return goods;
 		}
@@ -322,7 +326,9 @@
 
 				if (item.optBoolean("free_shipment"))
 					goods.setFreeShipment(1);
-
+				
+				if("1".equalsIgnoreCase(item.optString("material_lib_type")))
+					TaoKeTest.count++;
 				goodsList.add(goods);
 			}
 		}
@@ -1437,6 +1443,7 @@
 
 	/**
 	 * 浠庢窐瀹濋摼鎺ヤ腑瑙f瀽鍟嗗搧ID锛堥珮绾ф帴鍙o級
+	 * 
 	 * @param link
 	 * @return
 	 */
@@ -1452,8 +1459,37 @@
 		}
 		if (resultJSON == null)
 			return null;
-		
-		
+
+		return null;
+
+	}
+
+	/**
+	 * 娓犻亾閭�璇风爜
+	 * 
+	 * @param relationId
+	 * @return
+	 */
+	public static String getInviteCode(Long relationId, String accessToken) {
+		Map<String, String> map = new HashMap<>();
+		map.put("method", "taobao.tbk.sc.invitecode.get");
+		map.put("session", accessToken);
+		map.put("relation_id", relationId + "");
+		map.put("code_type", "2");
+		map.put("relation_app", "杩斿埄鍒�");
+		JSONObject resultJSON = null;
+		try {
+			TaoKeAppInfo app=new TaoKeAppInfo();
+			app.setAppKey("24567001");
+			app.setAppSecret("e26a8d0f8726883d44bf04742829b533");
+			app.setAdzoneId("123123");
+			resultJSON = TaoKeBaseUtil.baseRequest(map, app);
+		} catch (TaoKeApiException e) {
+			e.printStackTrace();
+		}
+		if (resultJSON == null)
+			return null;
+
 		return null;
 
 	}

--
Gitblit v1.8.0