From f38e508d334ae03024f0dce0d1fb6baed212dc24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 26 九月 2019 15:52:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/test/java/org/fanli/TaoKeTest.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index ee8bec7..d44fd92 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -22,15 +22,16 @@
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.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;
@@ -47,15 +48,8 @@
@Test
public void test1() {
- try {
- TaoKeAppInfo app = new TaoKeAppInfo("27867727", "781fce83545edbed13af32dc3fa9fc3a",
- "mm_124933865_865950258_109407350204");
- app.setAdzoneId("109407350204");
- TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(596441448615L, app);
- System.out.println(goods);
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- }
+ TaoBaoSearchResult result = TaoKeApiUtil.getMaterialByMaterialId(19450, 1, 100);
+ System.out.println(result);
}
@Test
@@ -75,7 +69,6 @@
System.out.println(goods);
// goods = TaoKeApiUtil.searchGoodsDetail(auctionId);
-
}
@Test
--
Gitblit v1.8.0