From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java | 68 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 26 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 f5c2839..46132ee 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,13 +1,12 @@
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.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -28,7 +27,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-import com.yeshi.fanli.exception.TaoBaoOrderException;
+import com.yeshi.fanli.exception.order.TaoBaoOrderException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -308,15 +307,8 @@
return getOrderList(30, config);
}
-
-
- public static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(String excelPath) {
- try {
- return parseWeiQuanOrder(new FileInputStream(new File(excelPath)));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
- return null;
+ public static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(InputStream input) {
+ return parseWeiQuanOrder(input);
}
private static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(String cookies, long startTime, long endTime) {
@@ -575,41 +567,41 @@
for (int c = 0; c < sheet.getColumns(); c++) {
String content = sheet.getCell(c, r).getContents().trim();
switch (c) {
- case 0://缁存潈鏃堕棿
+ case 0:// 缁存潈鏃堕棿
if (!StringUtil.isNullOrEmpty(content))
orderRecord.setWeiQuanTime(
new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));
break;
- case 1://缁存潈瀹屾垚鏃堕棿
+ case 1:// 缁存潈瀹屾垚鏃堕棿
if (!StringUtil.isNullOrEmpty(content))
orderRecord.setWeiQuanFinishTime(
new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));
break;
- case 2://缁撶畻鏃堕棿
+ case 2:// 缁撶畻鏃堕棿
if (!StringUtil.isNullOrEmpty(content))
orderRecord.setJieSuanTime(
new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));
break;
- case 3://鍟嗗搧鍚嶇О
+ case 3:// 鍟嗗搧鍚嶇О
orderRecord.setGoodsName(content);
break;
- case 5://娣樺疂璁㈠崟鍙�
+ case 5:// 娣樺疂璁㈠崟鍙�
orderRecord.setOrderId(content);
break;
- case 6://娣樺疂瀛愯鍗曞彿
+ case 6:// 娣樺疂瀛愯鍗曞彿
orderRecord.setOrderItemId(content);
break;
- case 7://缁存潈鐘舵��
+ case 7:// 缁存潈鐘舵��
orderRecord.setState(content);
break;
- case 8://缁撶畻閲戦
-
+ case 8:// 缁撶畻閲戦
+
break;
- case 9://閫�娆鹃噾棰�
+ case 9:// 閫�娆鹃噾棰�
orderRecord.setMoney(StringUtil.isNullOrEmpty(content) ? null : new BigDecimal(content));
break;
-
- case 10://杩旇繕鍟嗗閲戦
+
+ case 10:// 杩旇繕鍟嗗閲戦
orderRecord.setFanMoney(StringUtil.isNullOrEmpty(content) ? null : new BigDecimal(content));
break;
}
@@ -742,7 +734,7 @@
String tradeId = taoBaoOrder.getTradeId();
String orderByStr = tradeId.substring(startIndex, endIndex + 1);
if (orderByStr.length() > 8) {
- LogHelper.error("璁㈠崟鐨刼rderBy瓒呰繃8浣�:" + taoBaoOrder.getOrderBy());
+ LogHelper.error(taoBaoOrder.getOrderId() + "-璁㈠崟鐨刼rderBy瓒呰繃8浣�:" + taoBaoOrder.getOrderBy());
}
int orderBy = Integer.parseInt(orderByStr);
// taoBaoOrder.setOrderBy(orderBy);
@@ -809,4 +801,28 @@
return commonOrder;
}
+
+ /**
+ * 鑾峰彇涓�缁勮鍗曠殑hash鍊�
+ *
+ * @param list
+ * @return
+ */
+ public static String getOrderDataHashCode(List<TaoBaoOrder> list) {
+ List<TaoBaoOrder> orderList = new ArrayList<>();
+ orderList.addAll(list);
+ Comparator<TaoBaoOrder> orderCM = new Comparator<TaoBaoOrder>() {
+
+ @Override
+ public int compare(TaoBaoOrder o1, TaoBaoOrder o2) {
+ return Long.parseLong(o1.getTradeId()) - Long.parseLong(o2.getTradeId()) > 0 ? 1 : -1;
+ }
+ };
+ Collections.sort(orderList, orderCM);
+ String sts = "";
+ for (TaoBaoOrder order : orderList) {
+ sts += (order.getTradeId() + "-" + order.getSpecialId() + "-" + order.getRelationId());
+ }
+ return StringUtil.Md5(sts);
+ }
}
--
Gitblit v1.8.0