From 0019bfde4bb8188bc7d8d9ae7878d117c7bd539c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 17:07:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/test/java/org/fanli/TaoKeTest.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index a7f9414..1aecdbf 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -97,11 +97,19 @@
 
 	@Test
 	public void test2() {
-		String[] marks = new String[] { "\\(-\\)"};
+		// String result = TaoKeApiUtil.officialActivityConvert("19507100253",
+		// "1584519810786", "20211660");
+		// System.out.println(result);
 
-		List<String> textList = TaoBaoUtil.getTokenListFromText("寰╄=杩欐潯(VzUl1fzQWMT)杩涘叆銆怲ao瀹濄�戝嵆鍙姠璐�", Arrays.asList(marks));
+		// TaoKeApiUtil.getQuanInfo(579875678934L,
+		// "91b8984019e24fe1b1e3d6bd15479785");
+		String result = TaoKeApiUtil.getActivityInfo("1583739244161", TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT,
+				"511374878");
+		System.out.println(result);
 
-		System.out.println(textList);
+		String token = TaoKeApiUtil.getTKToken("http://", "鍙g澶栧崠绾㈠寘", result);
+		
+		System.out.println(token);
 	}
 
 	@Test
@@ -400,9 +408,11 @@
 		}
 
 	}
-	
+
 	@Test
-	public void test13(){
+	public void test13() {
+		TaoKeApiUtil.specialConvertCoupon(579875678934L, new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+				TaoBaoConstant.TAOBAO_AUTH_APPSECRET, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
 		try {
 			TaoKeApiUtil.getSimpleGoodsInfo(573867930843L);
 		} catch (TaobaoGoodsDownException e) {
@@ -410,4 +420,9 @@
 		}
 	}
 
+	@Test
+	public void test14() {
+		TaoKeApiUtil.getCouponListByItemId(614089154947L);
+	}
+
 }

--
Gitblit v1.8.0