From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息
---
fanli/src/test/java/org/fanli/TaoKeTest.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index 2854814..0ca55a0 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -35,8 +35,10 @@
import com.yeshi.fanli.util.BeanUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -64,19 +66,26 @@
// e.printStackTrace();
// }
-// String link = TaoKeApiUtil.officialActivityConvert(87140050199L + "", "1571715733668", "513796574");
-// System.out.println(link);
-
-// String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
-// "http://api.flqapp.com/fanli/client/v1/auth/callback/tb", 6396582L, "share");
-// System.out.println(link);
-
- try {
- TaoKeApiUtil.searchGoodsDetail(608512721647L);
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- }
-
+ // String link = TaoKeApiUtil.officialActivityConvert(87140050199L + "",
+ // "1571715733668", "513796574");
+ // System.out.println(link);
+
+ // String link =
+ // TaoBaoUtil.getTaoBaoUnionAuthUrl(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ // "http://api.flqapp.com/fanli/client/v1/auth/callback/tb", 6396582L,
+ // "share");
+ // System.out.println(link);
+
+ // try {
+ // TaoKeApiUtil.searchGoodsDetail(608512721647L);
+ // } catch (TaobaoGoodsDownException e) {
+ // e.printStackTrace();
+ // }
+
+ List<TaoBaoOrder> list = TaoKeOrderApiUtil.getTaoBaoRelationOrderList(
+ TimeUtil.convertToTimeTemp("2019-12-09 10:13:52", "yyyy-MM-dd HH:mm:ss"),
+ TimeUtil.convertToTimeTemp("2019-12-09 10:14:53", "yyyy-MM-dd HH:mm:ss"), 1);
+ System.out.println(list);
}
@Test
--
Gitblit v1.8.0