From 32f925357776c46bd9e35cf9aad4fdd0f6535d1d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 十月 2019 09:21:35 +0800
Subject: [PATCH] 订单奖励修改

---
 fanli/src/test/java/org/fanli/TaoKeTest.java |   43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index ed0feb6..3763633 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -15,6 +15,7 @@
 import org.yeshi.utils.HttpUtil;
 
 import com.yeshi.fanli.dao.mybatis.taobao.TBPidMapper;
+import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;
 import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.taobao.PidUser;
@@ -23,19 +24,19 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoLink;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
-import com.yeshi.fanli.exception.taobao.TaoKeApiException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
 import com.yeshi.fanli.service.inter.user.TBPidService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
 import com.yeshi.fanli.util.BeanUtil;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
 import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
 import net.sf.json.JSONArray;
@@ -48,38 +49,48 @@
 
 	@Test
 	public void test1() {
-		TaoKeApiUtil.getQuanInfo(574147597194L, "69e82c923a044dcbae7f36c6608f57eb");
+		System.out.println(TaoBaoUtil.filterTaoToken("锟uPdYM9Knxe锟�"));
 	}
 
 	@Test
 	public void test2() {
-		System.out.println(HttpUtil.getShortLink("http://h5.flq001.com"));
-		System.out.println(HttpUtil.getShortLink("http://h5.flq002.com"));
-		System.out.println(HttpUtil.getShortLink("http://h5.flq003.com"));
-		System.out.println(HttpUtil.getShortLink("http://h5.flq004.com"));
-		System.out.println(HttpUtil.getShortLink("http://h5.flq005.com"));
+
+		TaoBaoGoodsBrief goods = null;
+		try {
+			goods = TaoKeApiUtil.searchGoodsDetail(601535036423L);
+
+			// goods = TaoKeApiUtil.searchGoodsDetail(601535036423L, new
+			// TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+			// TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
+			// TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
+		} catch (TaobaoGoodsDownException e2) {
+			e2.printStackTrace();
+		}
+		System.out.println(goods);
+
+		// goods = TaoKeApiUtil.searchGoodsDetail(auctionId);
 	}
 
 	@Test
 	public void test3() {
 		Long auctionId = 598165623087L;
-		String appKey = "27821872";
-		String appSecret = "9277b7c40b753e142303eeabc1936c80";
-		String pid = "mm_491980152_690500060_109327900051";
-		TaoKeAppInfo app=new TaoKeAppInfo(appKey, appSecret, pid);
+		String appKey = "27965236";
+		String appSecret = "2be7a216bee767dc3a6388aa24f11140";
+		String pid = "mm_502940004_754900291_109486750166";
+		TaoKeAppInfo app = new TaoKeAppInfo(appKey, appSecret, pid);
 
 		try {
-			TaoKeApiUtil.createTaoLiJin(auctionId, "娣樼ぜ閲�", new BigDecimal(1), 1, new Date(),
+			TaoLiJinDTO dto = TaoKeApiUtil.createTaoLiJin(auctionId, "娣樼ぜ閲�", new BigDecimal(1), 1, new Date(),
 					new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 12L), new Date(),
 					new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 12L), app);
-		} catch (TaoKeApiException e) {
+			System.out.println(dto);
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
 
 	@Test
 	public void test4() {
-
 		TaoBaoOrderService taoBaoOrderService = BeanUtil.getBean(TaoBaoOrderService.class);
 		try {
 			List<TaoBaoOrder> list = TaoBaoOrderUtil.parseOrder(

--
Gitblit v1.8.0