From 68640e0d263b76ecfeaad80ea8587404b4413ad4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 08 三月 2019 16:44:45 +0800
Subject: [PATCH] 订单爬取规则修改
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java | 139 ++++++++++-----------------------------------
1 files changed, 32 insertions(+), 107 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 5b0d224..9e38dea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
@@ -11,13 +11,11 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import com.taobao.api.TaobaoObject;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.taobao.PidUser;
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;
@@ -35,7 +33,6 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.taobao.TaoBao110Util;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
@@ -202,29 +199,36 @@
}
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<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("姝ｅ湪鎵ц璁㈠崟鐖彇缁撴潫锛屽叡鏈夎鍗�:" + orderList.size());
addOrder(orderList);
@@ -269,54 +273,6 @@
}
return orderList;
- }
-
- private void addRelationAndSpecialOrder(List<TaoBaoOrder> orderList) {
- try {
- taoBaoOrderService.addTaoBaoOrderList(orderList);
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
-
- try {
- Map<String, List<TaoBaoOrder>> map = TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(orderList);
- if (map != null) {
- Iterator<String> its = map.keySet().iterator();
- while (its.hasNext()) {
- String key = its.next();
- List<TaoBaoOrder> orders = map.get(key);
- String redisKey = "addorderqueue-" + key;
- // redis鍋氶鐜囬檺鍒�
- try {
- if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {
- continue;
- }
-
- } catch (Exception e) {
-
- }
-
- CMQManager.getInstance().addTaoBaoOrderMsg(key, orders);
-
- try {
- // 6灏忔椂鍐呬笉鍐嶅鐞�
- redisManager.cacheCommonString(redisKey, "1", 60 * 60 * 6);
- } catch (Exception e) {
-
- }
- }
- }
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
}
private void addOrder(List<TaoBaoOrder> orderList) {
@@ -414,39 +370,8 @@
public void doJob6() {
if (!Constant.IS_TASK)
return;
- List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
- LogHelper.orderInfo("姝ｅ湪鎵ц璁㈠崟鐖彇...");
- // 鐖彇1鍒嗛挓浠ュ墠鐨�
- long endTime = System.currentTimeMillis() - 1000 * 60 * 1L;
- List<TaoBaoOrder> orderList = new ArrayList<TaoBaoOrder>();
- try {
- orderList = TaoBaoOrderUtil.getOrderList(endTime - 1000 * 60 * 60 * 24 * 2L, endTime, configList.get(0));
- TaoBao110Util.rightTaoBaoOrderWarning();
- } catch (TaoBaoOrderException e) {
- try {
- LogHelper.errorDetailInfo(e);
- TaoBao110Util.reportTaoBaoOrderWarning(e.getCode(), e.getMessage());
- } catch (Exception e2) {
- e2.printStackTrace();
- }
- }
- List<TaoBaoOrder> thirdOrderList = new ArrayList<>();
- try {
- thirdOrderList = TaoBaoOrderUtil.getThirdServiceOrderList(endTime - 1000 * 60 * 60 * 24 * 2L, endTime,
- configList.get(0));
- } catch (TaoBaoOrderException e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e2) {
- e2.printStackTrace();
- }
- }
- if (thirdOrderList != null && thirdOrderList.size() > 0)
- orderList.addAll(thirdOrderList);
- if (orderList != null && orderList.size() > 0)
- dataMonitorService.parseTaoBaoOrderSuccess();
- LogHelper.orderInfo("姝ｅ湪鎵ц璁㈠崟鐖彇缁撴潫锛屽叡鏈夎鍗�:" + orderList.size());
- addOrder(orderList);
+ long endTime=System.currentTimeMillis();
+ updateOrder(endTime-1000*60*20L, endTime);
}
// 杩斿埄
--
Gitblit v1.8.0