From 573868c096a920acdb2c003f518d3a94f2e5567c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 四月 2019 17:57:25 +0800
Subject: [PATCH] 系統緩存bug修改
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java | 97 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 84 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
index 6f69f45..deddf2b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java
@@ -8,9 +8,11 @@
import com.yeshi.fanli.dto.order.OrderQuery;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
@@ -20,13 +22,13 @@
//娣樺疂瀹PI鎺ュ彛
public class TaoKeOrderApiUtil {
-
- public static int TK_STATUS_ALL=1;
- public static int TK_STATUS_SETTLEMENT=3;
- public static int TK_STATUS_PAY=12;
- public static int TK_STATUS_SUCCESS=14;
- public static int TK_STATUS_INVALID=13;
-
+
+ public static int TK_STATUS_ALL = 1;
+ public static int TK_STATUS_SETTLEMENT = 3;
+ public static int TK_STATUS_PAY = 12;
+ public static int TK_STATUS_SUCCESS = 14;
+ public static int TK_STATUS_INVALID = 13;
+
/**
* 鑾峰彇浼氬憳璁㈠崟
*
@@ -359,8 +361,8 @@
private static List<TaoBaoOrder> getThirdTSpecialOrder(long startTime, int span) {
int page = 1;
String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
- List<TaoBaoOrder> orderList = getTaoBaoSpecialThirdOrder(startTimeStr, span, page, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ List<TaoBaoOrder> orderList = getTaoBaoSpecialThirdOrder(startTimeStr, span, page,
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
while (orderList.size() == 100 * page) {
page++;
List<TaoBaoOrder> tempOrderList = getTaoBaoSpecialThirdOrder(startTimeStr, span, page,
@@ -374,8 +376,8 @@
private static List<TaoBaoOrder> getRelationOrder(long startTime, int span) {
int page = 1;
String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
- List<TaoBaoOrder> orderList = getTaoBaoRelationOrder(startTimeStr, span, page, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ List<TaoBaoOrder> orderList = getTaoBaoRelationOrder(startTimeStr, span, page,
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
while (orderList.size() == 100 * page) {
page++;
List<TaoBaoOrder> tempOrderList = getTaoBaoRelationOrder(startTimeStr, span, page,
@@ -389,8 +391,8 @@
private static List<TaoBaoOrder> getThirdRelationOrder(long startTime, int span) {
int page = 1;
String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
- List<TaoBaoOrder> orderList = getTaoBaoRelationThirdOrder(startTimeStr, span, page, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ List<TaoBaoOrder> orderList = getTaoBaoRelationThirdOrder(startTimeStr, span, page,
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
while (orderList.size() == 100 * page) {
page++;
List<TaoBaoOrder> tempOrderList = getTaoBaoRelationThirdOrder(startTimeStr, span, page,
@@ -512,4 +514,73 @@
}
return orderList;
}
+
+ private static List<TaoBaoOrder> getTaoBaoSettleOrders(long startTime, int span, boolean third) {
+ OrderQuery orderQuery = new OrderQuery();
+ orderQuery.span = span;
+ orderQuery.orderQueryType = "settle_time";
+ orderQuery.orderScene = 1;
+ orderQuery.pageSize = 100;
+ int page = 1;
+ orderQuery.pageNo = page;
+ if (third)
+ orderQuery.orderCountType = 2;
+ else
+ orderQuery.orderCountType = 1;
+
+ String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
+ orderQuery.startTime = startTimeStr;
+ List<TaoBaoOrder> orderList = queryTaoBaoOrder(orderQuery, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ while (orderList.size() == 100 * page) {
+ page++;
+ orderQuery.pageNo = page;
+ List<TaoBaoOrder> tempOrderList = queryTaoBaoOrder(orderQuery, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ if (tempOrderList != null && tempOrderList.size() > 0)
+ orderList.addAll(tempOrderList);
+ }
+ return orderList;
+ }
+
+ /**
+ * 鑾峰彇缁撶畻璁㈠崟
+ *
+ * @param startTime
+ * @param endTime
+ * @param third
+ * -鏄惁涓虹涓夋柟璁㈠崟
+ * @return
+ */
+ public static List<TaoBaoOrder> getTaoBaoSettleOrders(long startTime, long endTime, boolean third) {
+ 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 = getTaoBaoSettleOrders(startT, s, third);
+ if (tempOrderList != null && tempOrderList.size() > 0)
+ orderList.addAll(tempOrderList);
+
+ try {
+ Thread.sleep(1000 * 10);// 鍔犱釜寤舵椂锛岄槻姝PI璇锋眰棰戠巼闄愬埗
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ return orderList;
+ }
+
+ public static List<TaoBaoWeiQuanOrder> getTaoBaoWeiQuanOrderList() {
+
+ return null;
+ }
}
--
Gitblit v1.8.0