From f4b0bb5dfda8f21409b9eb0b2ee6e436c87475e3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 十二月 2018 15:52:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/test/java/org/fanli/TaoKeTest.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index 4232008..2ac6799 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -1,15 +1,27 @@
package org.fanli;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.List;
+
import org.junit.Ignore;
import org.junit.Test;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+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.exception.taobao.TaobaoGoodsUpdateException;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
+import com.yeshi.fanli.util.BeanUtil;
+import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-@Ignore
+//@Ignore
public class TaoKeTest {
@Test
@@ -35,6 +47,34 @@
@Test
public void test3() {
- System.out.println("娴嬭瘯鍚堝苟222");
+ TaoBaoGoodsUpdateService taoBaoGoodsUpdateService = BeanUtil.getBean(TaoBaoGoodsUpdateService.class);
+ try {
+ taoBaoGoodsUpdateService.updateTaoBaoGoods(TaoKeApiUtil.searchGoodsDetail(571566226590L));
+ } catch (TaobaoGoodsUpdateException e) {
+ e.printStackTrace();
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void test4() {
+
+ TaoBaoOrderService taoBaoOrderService = BeanUtil.getBean(TaoBaoOrderService.class);
+ try {
+ List<TaoBaoOrder> list = TaoBaoOrderUtil.parseOrder(
+ new FileInputStream(new File("C:/Users/Administrator/Desktop/娣樺疂璁㈠崟/2018.1.10-2018-03-12 (2).xls")));
+ for (int i = 0; i < list.size(); i++) {
+// if (TimeUtil.convertToTimeTemp(list.get(i).getCreateTime(), "yyyy-MM-dd HH:mm:ss") > 1522339200000l) {
+// list.remove(i);
+// i--;
+// }
+ }
+
+ taoBaoOrderService.addTaoBaoOrderList(list);
+ System.out.println(list);
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
}
}
--
Gitblit v1.8.0