From 37194e2d4b4ab85f7f29c1e900c406afe294579a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 13 八月 2019 12:17:48 +0800
Subject: [PATCH] 模拟请求缓存商品数据，淘礼金商品兼容多个appkey
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java | 94 +++++++++++++++++++++++++++++-----------------
1 files changed, 59 insertions(+), 35 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..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
@@ -1,10 +1,14 @@
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;
@@ -306,16 +310,8 @@
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(InputStream input) {
+ return parseWeiQuanOrder(input);
}
private static List<TaoBaoWeiQuanOrder> getWeiQuanOrders(String cookies, long startTime, long endTime) {
@@ -574,38 +570,42 @@
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;
}
}
@@ -804,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