From 2f6a3e5cdbfe41b011893d32cc7c4b166adfab5d Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 27 十一月 2018 10:20:09 +0800
Subject: [PATCH] 维权订单处理更改

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 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 6f0d7c0..f67466c 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
@@ -357,7 +357,7 @@
 		String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd");
 		String endTimeStr = TimeUtil.getGernalTime(endTime, "yyyy-MM-dd");
 		String url = String.format(
-				"http://pub.alimama.com/report/getNewTbkRefundPaymentDetails.json?spm=a219t.7664554.1998457203.105.49cc35d9eDSunp&refundType=1&searchType=3&DownloadID=DOWNLOAD_EXPORT_CPSPAYMENT_REFUND_OVERVIEW&startTime=%s&endTime=%s",
+				"http://pub.alimama.com/report/getNewTbkRefundPaymentDetails.json?spm=a219t.7664554.1998457203.105.49cc35d9eDSunp&refundType=1&searchType=1&DownloadID=DOWNLOAD_EXPORT_CPSPAYMENT_REFUND_OVERVIEW&startTime=%s&endTime=%s",
 				startTimeStr, endTimeStr);
 		Map<String, String> headers = new HashMap<>();
 		headers.put("User-Agent",
@@ -372,13 +372,13 @@
 
 		list.addAll(getThirdWeiQuanOrders(cookies, startTime, endTime));
 
-		if (list != null)
-			for (int i = 0; i < list.size(); i++) {
-				if (!list.get(i).getState().equalsIgnoreCase("缁存潈鎴愬姛")) {
-					list.remove(i);
-					i--;
-				}
-			}
+		// if (list != null)
+		// for (int i = 0; i < list.size(); i++) {
+		// if (!list.get(i).getState().equalsIgnoreCase("缁存潈鎴愬姛")) {
+		// list.remove(i);
+		// i--;
+		// }
+		// }
 		return list;
 	}
 
@@ -646,13 +646,19 @@
 						orderRecord.setState(content);
 						break;
 					case 6://
-						orderRecord.setJieSuanTime(content);
+						if (!StringUtil.isNullOrEmpty(content))
+							orderRecord.setJieSuanTime(
+									new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));
 						break;
 					case 7://
-						orderRecord.setWeiQuanTime(content);
+						if (!StringUtil.isNullOrEmpty(content))
+							orderRecord.setWeiQuanTime(
+									new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));
 						break;
 					case 8://
-						orderRecord.setWeiQuanFinishTime(content);
+						if (!StringUtil.isNullOrEmpty(content))
+							orderRecord.setWeiQuanFinishTime(
+									new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd HH:mm:ss")));
 						break;
 					}
 				}

--
Gitblit v1.8.0