From 522315ae42936583042fc08aabda7e3c9e7a7b5d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 15:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/test/java/org/fanli/TaoKeTest.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index 1aecdbf..3957b80 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -8,12 +8,10 @@
import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Scanner;
import org.junit.Test;
import org.yeshi.utils.HttpUtil;
@@ -38,12 +36,11 @@
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
import com.yeshi.fanli.util.BeanUtil;
-import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
-import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
@@ -108,7 +105,7 @@
System.out.println(result);
String token = TaoKeApiUtil.getTKToken("http://", "鍙ｇ澶栧崠绾㈠寘", result);
-
+
System.out.println(token);
}
@@ -414,7 +411,7 @@
TaoKeApiUtil.specialConvertCoupon(579875678934L, new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
try {
- TaoKeApiUtil.getSimpleGoodsInfo(573867930843L);
+ TaoKeApiUtil.getSimpleGoodsInfo(556371219169L);
} catch (TaobaoGoodsDownException e) {
e.printStackTrace();
}
@@ -422,7 +419,21 @@
@Test
public void test14() {
- TaoKeApiUtil.getCouponListByItemId(614089154947L);
+
+ Long[] ids = new Long[] {
+ 547050481823L,612971793223L
+ };
+ try {
+ for (Long id : ids) {
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.getSimpleGoodsInfo(id);
+ System.out.println(goods.getMaterialLibType());
+ }
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ }
+
+ // DaTaoKeApiUtil.convertLink(614847140426L,
+ // TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT);
}
}
--
Gitblit v1.8.0