From c833ab8f5968c755ded82eea5e8ce2aca841a0cb Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 27 九月 2019 15:14:06 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/test/java/org/fanli/TaoKeTest.java | 60 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index cb87218..ae9db0d 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -1,9 +1,12 @@
+
package org.fanli;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -19,23 +22,21 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
-import com.yeshi.fanli.entity.taobao.TaoBaoPunishOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
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.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;
@@ -47,37 +48,44 @@
@Test
public void test1() {
- // TaoBaoShop shop=
- // TaoBaoUtil.getTaoBaoShopDetailByAuctionId(536542467108L);
- // System.out.println(shop);
- long startTime = TimeUtil.convertToTimeTemp("2019-04-02 00:00:00", "yyyy-MM-dd HH:mm:ss");
-
- List<TaoBaoPunishOrder> list = TaoKeOrderApiUtil.getPunishOrderList(startTime,
- startTime + 1000 * 60 * 60 * 24L);
- System.out.println(list);
-
- // TaoKeApiUtil.getTaoKeContentEffective();
- // TaoKeApiUtil.getTaoKeContent();
+ TaoBaoSearchResult result = TaoKeApiUtil.getMaterialByMaterialId(16432, 1, 100);
+ System.out.println(result);
}
@Test
public void test2() {
- TaoKeAppInfo app = new TaoKeAppInfo();
- app.setAdzoneId("44841750025");
- app.setAppKey("25070111");
- app.setAppSecret("c7809ad9cd926fc45199d1d3ab7fe2eb");
- app.setPid("mm_124933865_113050446_44841750025");
+
+ TaoBaoGoodsBrief goods = null;
try {
- TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(527893773636L, app);
- System.out.println(goods.getId());
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
+ 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() {
- TaoKeApiUtil.taoKeContent();
+ Long auctionId = 598165623087L;
+ String appKey = "27821872";
+ String appSecret = "9277b7c40b753e142303eeabc1936c80";
+ String pid = "mm_491980152_690500060_109327900051";
+ TaoKeAppInfo app = new TaoKeAppInfo(appKey, appSecret, pid);
+
+ try {
+ 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 (Exception e) {
+ e.printStackTrace();
+ }
}
@Test
--
Gitblit v1.8.0