From c8a99ed8218fe034e9c33236969fcbec9eac75bb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 24 七月 2019 14:23:25 +0800 Subject: [PATCH] 调整淘宝订单与维权订单爬取 --- fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java | 77 ++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 36 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java index 15c0c57..f5c2839 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java @@ -1,11 +1,13 @@ package com.yeshi.fanli.util.taobao; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; import java.net.URLEncoder; import java.util.ArrayList; -import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.Iterator; @@ -306,16 +308,15 @@ return getOrderList(30, config); } - /** - * 鑾峰彇缁存潈鎴愬姛璁㈠崟 - * - * @param startTime - * @param endTime - * @return - */ - public static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(long startTime, long endTime, TaoBaoUnionConfig config) { - String cookie = getTaoBaoCookie(config.getAccount()); - return getWeiQuanOrders(cookie, startTime, endTime); + + + public static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(String excelPath) { + try { + return parseWeiQuanOrder(new FileInputStream(new File(excelPath))); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + return null; } private static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(String cookies, long startTime, long endTime) { @@ -574,39 +575,43 @@ for (int c = 0; c < sheet.getColumns(); c++) { String content = sheet.getCell(c, r).getContents().trim(); switch (c) { - case 0:// - orderRecord.setOrderId(content); - break; - case 1:// - orderRecord.setOrderItemId(content); - break; - case 2:// - orderRecord.setGoodsName(content); - break; - case 3: - orderRecord.setMoney(StringUtil.isNullOrEmpty(content) ? null : new BigDecimal(content)); - break; - case 4: - orderRecord.setFanMoney(StringUtil.isNullOrEmpty(content) ? null : new BigDecimal(content)); - break; - case 5:// - orderRecord.setState(content); - break; - case 6:// - if (!StringUtil.isNullOrEmpty(content)) - orderRecord.setJieSuanTime( - new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss"))); - break; - case 7:// + case 0://缁存潈鏃堕棿 if (!StringUtil.isNullOrEmpty(content)) orderRecord.setWeiQuanTime( new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss"))); break; - case 8:// + case 1://缁存潈瀹屾垚鏃堕棿 if (!StringUtil.isNullOrEmpty(content)) orderRecord.setWeiQuanFinishTime( new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss"))); break; + case 2://缁撶畻鏃堕棿 + if (!StringUtil.isNullOrEmpty(content)) + orderRecord.setJieSuanTime( + new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss"))); + break; + case 3://鍟嗗搧鍚嶇О + orderRecord.setGoodsName(content); + break; + case 5://娣樺疂璁㈠崟鍙� + orderRecord.setOrderId(content); + break; + case 6://娣樺疂瀛愯鍗曞彿 + orderRecord.setOrderItemId(content); + break; + case 7://缁存潈鐘舵�� + orderRecord.setState(content); + break; + case 8://缁撶畻閲戦 + + break; + case 9://閫�娆鹃噾棰� + orderRecord.setMoney(StringUtil.isNullOrEmpty(content) ? null : new BigDecimal(content)); + break; + + case 10://杩旇繕鍟嗗閲戦 + orderRecord.setFanMoney(StringUtil.isNullOrEmpty(content) ? null : new BigDecimal(content)); + break; } } if (!StringUtil.isNullOrEmpty(orderRecord.getOrderId())) -- Gitblit v1.8.0