From 01e773cf27e572b8fb83538d85f31130930d93d1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 15 八月 2019 15:57:23 +0800
Subject: [PATCH] 券赠送
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 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..eb8ba64 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
@@ -8,6 +8,8 @@
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;
@@ -308,15 +310,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 +570,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;
}
@@ -809,4 +804,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();
+ }
+ return StringUtil.Md5(sts);
+ }
}
--
Gitblit v1.8.0