From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复,APP端佣金比例展示错误bug修复

---
 fanli/src/test/java/org/fanli/TaoKeTest.java |   64 +++++++++++++++++++++++++------
 1 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index e5b23ed..a0ba7ee 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -12,7 +12,6 @@
 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;
@@ -37,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;
 
@@ -88,21 +86,31 @@
 		// 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);
+//		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);
+		
+		 String result = TaoKeApiUtil.officialActivityConvert("19507100253",
+				 "1571715733668", "20211660").getShort_click_url();
+		 System.out.println(result);
 	}
 
 	@Test
 	public void test2() {
-		try {
-			TaoKeApiUtil.getSimpleGoodsInfo(539432362036L);
-		} catch (TaobaoGoodsDownException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		// String result = TaoKeApiUtil.officialActivityConvert("19507100253",
+		// "1584519810786", "20211660");
+		// System.out.println(result);
 
+		// TaoKeApiUtil.getQuanInfo(579875678934L,
+		// "91b8984019e24fe1b1e3d6bd15479785");
+		String result = TaoKeApiUtil.getActivityInfo("1583739244161", TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT,
+				"511374878");
+		System.out.println(result);
+
+		String token = TaoKeApiUtil.getTKToken("http://", "鍙g澶栧崠绾㈠寘", result);
+
+		System.out.println(token);
 	}
 
 	@Test
@@ -402,4 +410,34 @@
 
 	}
 
+	@Test
+	public void test13() {
+		TaoKeApiUtil.specialConvertCoupon(579875678934L, new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+				TaoBaoConstant.TAOBAO_AUTH_APPSECRET, TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
+		try {
+			TaoKeApiUtil.getSimpleGoodsInfo(556371219169L);
+		} catch (TaobaoGoodsDownException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Test
+	public void test14() {
+
+		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