From 7c20392173f080d22c4a6f8cb391b618f60aac29 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 09 三月 2019 16:16:54 +0800
Subject: [PATCH] 订单爬取方式更改

---
 fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java |   57 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
index d31ddb3..495afa7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
@@ -16,6 +16,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.log.LogHelper;
 import com.yeshi.fanli.service.inter.common.DataMonitorService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
@@ -200,34 +201,34 @@
 
 	public void updateOrder(long startTime, long endTime) {
 //		鑰佺増鏈鐞嗘柟寮�
-//		List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
-//		List<TaoBaoOrder> orderList = new ArrayList<>();
-//		try {
-//			orderList = TaoBaoOrderUtil.getOrderList(startTime, endTime, configList.get(0));
-//		} catch (TaoBaoOrderException e2) {
-//			try {
-//				LogHelper.errorDetailInfo(e2);
-//			} catch (Exception e) {
-//				e.printStackTrace();
-//			}
-//		}
-//		List<TaoBaoOrder> thirdOrderList = new ArrayList<>();
-//		try {
-//			thirdOrderList = TaoBaoOrderUtil.getThirdServiceOrderList(startTime, endTime, configList.get(0));
-//		} catch (TaoBaoOrderException e2) {
-//			try {
-//				LogHelper.errorDetailInfo(e2);
-//			} catch (Exception e) {
-//				e.printStackTrace();
-//			}
-//		}
-//		if (thirdOrderList != null && thirdOrderList.size() > 0)
-//			orderList.addAll(thirdOrderList);
-		
-		List<TaoBaoOrder> orderList=	getCommonOrder(startTime, endTime);
-		List<TaoBaoOrder> tempOrderList2=getThirdCommonOrder(startTime, endTime);
-		if(tempOrderList2!=null&&tempOrderList2.size()>0)
-			orderList.addAll(tempOrderList2);
+		List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
+		List<TaoBaoOrder> orderList = new ArrayList<>();
+		try {
+			orderList = TaoBaoOrderUtil.getOrderList(startTime, endTime, configList.get(0));
+		} catch (TaoBaoOrderException e2) {
+			try {
+				LogHelper.errorDetailInfo(e2);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		List<TaoBaoOrder> thirdOrderList = new ArrayList<>();
+		try {
+			thirdOrderList = TaoBaoOrderUtil.getThirdServiceOrderList(startTime, endTime, configList.get(0));
+		} catch (TaoBaoOrderException e2) {
+			try {
+				LogHelper.errorDetailInfo(e2);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		if (thirdOrderList != null && thirdOrderList.size() > 0)
+			orderList.addAll(thirdOrderList);
+//鏂扮増鏈鐞嗘柟寮�		
+//		List<TaoBaoOrder> orderList=	getCommonOrder(startTime, endTime);
+//		List<TaoBaoOrder> tempOrderList2=getThirdCommonOrder(startTime, endTime);
+//		if(tempOrderList2!=null&&tempOrderList2.size()>0)
+//			orderList.addAll(tempOrderList2);
 		
 
 		LogHelper.orderInfo("姝e湪鎵ц璁㈠崟鐖彇缁撴潫锛屽叡鏈夎鍗�:" + orderList.size());

--
Gitblit v1.8.0