From f5ad4a8171b20ab75eaac90c9717fe7fd801d6cd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 08 三月 2019 16:18:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 173 insertions(+), 3 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 e9af6f6..5b0d224 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.job;
import java.util.ArrayList;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -10,6 +11,8 @@
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;
@@ -22,6 +25,7 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
+import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.order.PidOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
@@ -33,6 +37,7 @@
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;
//浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
@Component
@@ -78,7 +83,125 @@
@Resource
private LostOrderService lostOrderService;
- private void updateOrder(long startTime, long endTime) {
+ @Resource
+ private OrderService orderService;
+
+ /**
+ * 鏂扮増鑾峰彇鏅�氳鍗�
+ *
+ * @param startTime
+ * @param span
+ * @return
+ */
+ private static List<TaoBaoOrder> getCommonOrder(long startTime, int span) {
+ int page = 1;
+ String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,
+ Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);
+ while (orderList.size() == 100 * page) {
+ page++;
+ List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,
+ Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);
+ if (tempOrderList != null && tempOrderList.size() > 0)
+ orderList.addAll(tempOrderList);
+ }
+ return orderList;
+ }
+
+ /**
+ * 鑾峰彇绗笁鏂规櫘閫氳鍗�
+ * @param startTime
+ * @param span
+ * @return
+ */
+ private static List<TaoBaoOrder> getThirdCommonOrder(long startTime, int span) {
+ int page = 1;
+ String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(startTimeStr, span, page,
+ Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);
+ while (orderList.size() == 100 * page) {
+ page++;
+ List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(startTimeStr, span, page,
+ Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);
+ if (tempOrderList != null && tempOrderList.size() > 0)
+ orderList.addAll(tempOrderList);
+ }
+ return orderList;
+ }
+
+ /**
+ * 鑾峰彇鏌愪釜鍖洪棿娈电殑璁㈠崟
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ public static List<TaoBaoOrder> getCommonOrder(long startTime, long endTime) {
+ List<TaoBaoOrder> orderList = new ArrayList<>();
+ long span =(endTime - startTime)%1000==0? (endTime - startTime)/1000:(endTime - startTime)/1000+1;
+ int count = (int) (span / 1200);
+ if (span % 1200 != 0)
+ count++;
+ for (int i = 0; i < count; i++) {
+ long startT = startTime + i * 1200 * 1000L;
+ int s = 1200;
+ if (endTime < startT + 1200 * 1000L) {
+ s = (int) ((endTime - startT) / 1000) + 1;
+ if (s < 60)
+ s = 60;
+ }
+ List<TaoBaoOrder> tempOrderList = getCommonOrder(startT, s);
+ if (tempOrderList != null && tempOrderList.size() > 0)
+ orderList.addAll(tempOrderList);
+ }
+ return orderList;
+ }
+
+
+ /**
+ * 鐖彇涓夋柟璁㈠崟
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ public static List<TaoBaoOrder> getThirdCommonOrder(long startTime, long endTime) {
+ List<TaoBaoOrder> orderList = new ArrayList<>();
+ long span =(endTime - startTime)%1000==0? (endTime - startTime)/1000:(endTime - startTime)/1000+1;
+ int count = (int) (span / 1200);
+ if (span % 1200 != 0)
+ count++;
+ for (int i = 0; i < count; i++) {
+ long startT = startTime + i * 1200 * 1000L;
+ int s = 1200;
+ if (endTime < startT + 1200 * 1000L) {
+ s = (int) ((endTime - startT) / 1000) + 1;
+ if (s < 60)
+ s = 60;
+ }
+ List<TaoBaoOrder> tempOrderList = getThirdCommonOrder(startT, s);
+ if (tempOrderList != null && tempOrderList.size() > 0)
+ orderList.addAll(tempOrderList);
+ }
+ return orderList;
+ }
+
+ /**
+ * 鎸夊ぉ鑾峰彇鏅�氳鍗曪紙鏂扮増锛�
+ *
+ * @param date
+ * @return
+ */
+ public List<TaoBaoOrder> getCommonOrderByDay(Date date) {
+ List<TaoBaoOrder> orderList = new ArrayList<>();
+ // 灏嗕竴澶╁垎鎴�12娈�
+ for (int i = 0; i < 72; i++) {
+ List<TaoBaoOrder> tempOrderList = getCommonOrder(date.getTime() + 1000 * 60 * 20L * i, 1200);
+ if (tempOrderList != null && tempOrderList.size() > 0)
+ orderList.addAll(tempOrderList);
+ }
+ return orderList;
+ }
+
+ public void updateOrder(long startTime, long endTime) {
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
List<TaoBaoOrder> orderList = new ArrayList<>();
try {
@@ -110,7 +233,42 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
+ }
+ public static List<TaoBaoOrder> mixTaoBaoOrder(List<TaoBaoOrder> commonOrderList, List<TaoBaoOrder> sorderList) {
+ Map<String, List<TaoBaoOrder>> commonMap = TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(commonOrderList);
+ Map<String, List<TaoBaoOrder>> sMap = TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(sorderList);
+ // 鑾峰彇璁㈠崟浜ら泦
+ Iterator<String> its = commonMap.keySet().iterator();
+ List<String> commonOrderIdList = new ArrayList<>();
+ List<String> sOrderIdList = new ArrayList<>();
+ while (its.hasNext()) {
+ String orderId = its.next();
+ commonOrderIdList.add(orderId);
+ }
+ its = sMap.keySet().iterator();
+ while (its.hasNext()) {
+ String orderId = its.next();
+ sOrderIdList.add(orderId);
+ }
+
+ // 姹備氦闆�
+ commonOrderIdList.retainAll(sOrderIdList);
+
+ List<TaoBaoOrder> orderList = new ArrayList<>();
+
+ for (String orderId : commonOrderIdList) {
+ List<TaoBaoOrder> list = commonMap.get(orderId);
+ String specialId = sMap.get(orderId).get(0).getSpecialId();
+ String relationId = sMap.get(orderId).get(0).getRelationId();
+ for (TaoBaoOrder to : list) {
+ to.setSpecialId(specialId);
+ to.setRelationId(relationId);
+ orderList.add(to);
+ }
+ }
+
+ return orderList;
}
private void addRelationAndSpecialOrder(List<TaoBaoOrder> orderList) {
@@ -168,8 +326,20 @@
// 绉婚櫎浼氬憳杩愯惀ID涓庢笭閬撲笓灞炶鍗�
if (orderList.get(i).getAdPositionName().contains("浼氬憳杩愯惀")
|| orderList.get(i).getAdPositionName().contains("娓犻亾涓撳睘")) {
- orderList.remove(i);
- i--;
+ if (orderList.get(i).getAdPositionName().contains("浼氬憳杩愯惀")) {// 澶勭悊璁㈠崟鐢宠瘔
+ Order order = orderService.findOrderByOrderIdAndType(orderList.get(i).getOrderId(),
+ Order.ORDER_TYPE_TAOBAO);
+ if (order != null && order.getBeizhu().contains("琛ュ崟")) {// 涓嶆帓闄よˉ鍗曠殑鎯呭喌
+
+ } else {
+ orderList.remove(i);
+ i--;
+ break;
+ }
+ } else {
+ orderList.remove(i);
+ i--;
+ }
}
}
--
Gitblit v1.8.0