From eb214553bde0ff87d9c3d4cb9187db3b4e3cbcea Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 20 八月 2019 17:32:32 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeOrderApiUtil.java | 111 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 65 insertions(+), 46 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 e3679dc..832841c 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
@@ -40,16 +40,19 @@
* @param appSecret
* @return
*/
- private static List<TaoBaoOrder> getTaoBaoSpecialOrder(String startTime, int span, int page, String appKey,
- String appSecret) {
+ private static List<TaoBaoOrder> getTaoBaoSpecialOrder(String startTime, int span, int page, int tkStatus,
+ String appKey, String appSecret) {
OrderQuery orderQuery = new OrderQuery();
orderQuery.startTime = startTime;
- orderQuery.tkStatus = 1;
+ orderQuery.tkStatus = tkStatus;
orderQuery.orderScene = 3;
orderQuery.pageNo = page;
orderQuery.pageSize = 100;
orderQuery.span = span;
- orderQuery.orderQueryType = "create_time";
+ if (tkStatus == TK_STATUS_SETTLEMENT)
+ orderQuery.orderQueryType = "settle_time";
+ else
+ orderQuery.orderQueryType = "create_time";
return queryTaoBaoOrder(orderQuery, appKey, appSecret);
}
@@ -62,12 +65,15 @@
* @param appSecret
* @return
*/
- private static List<TaoBaoOrder> getTaoBaoSpecialThirdOrder(String startTime, int span, int page, String appKey,
- String appSecret) {
+ private static List<TaoBaoOrder> getTaoBaoSpecialThirdOrder(String startTime, int span, int page, int tkStatus,
+ String appKey, String appSecret) {
OrderQuery orderQuery = new OrderQuery();
orderQuery.startTime = startTime;
- orderQuery.tkStatus = 1;
- orderQuery.orderQueryType = "create_time";
+ orderQuery.tkStatus = tkStatus;
+ if (tkStatus == TK_STATUS_SETTLEMENT)
+ orderQuery.orderQueryType = "settle_time";
+ else
+ orderQuery.orderQueryType = "create_time";
orderQuery.orderScene = 3;
orderQuery.pageNo = page;
orderQuery.pageSize = 100;
@@ -84,14 +90,17 @@
* @param appSecret
* @return
*/
- private static List<TaoBaoOrder> getTaoBaoRelationOrder(String startTime, int span, int page, String appKey,
- String appSecret) {
+ private static List<TaoBaoOrder> getTaoBaoRelationOrder(String startTime, int span, int page, int tkStatus,
+ String appKey, String appSecret) {
OrderQuery orderQuery = new OrderQuery();
orderQuery.startTime = startTime;
orderQuery.span = span;
- orderQuery.tkStatus = 1;
- orderQuery.orderQueryType = "create_time";
+ orderQuery.tkStatus = tkStatus;
+ if (tkStatus == TK_STATUS_SETTLEMENT)
+ orderQuery.orderQueryType = "settle_time";
+ else
+ orderQuery.orderQueryType = "create_time";
orderQuery.orderScene = 2;
orderQuery.pageNo = page;
orderQuery.pageSize = 100;
@@ -107,13 +116,16 @@
* @param appSecret
* @return
*/
- private static List<TaoBaoOrder> getTaoBaoRelationThirdOrder(String startTime, int span, int page, String appKey,
- String appSecret) {
+ private static List<TaoBaoOrder> getTaoBaoRelationThirdOrder(String startTime, int span, int page, int tkStatus,
+ String appKey, String appSecret) {
OrderQuery orderQuery = new OrderQuery();
orderQuery.startTime = startTime;
orderQuery.span = span;
- orderQuery.tkStatus = 1;
- orderQuery.orderQueryType = "create_time";
+ orderQuery.tkStatus = tkStatus;
+ if (tkStatus == TK_STATUS_SETTLEMENT)
+ orderQuery.orderQueryType = "settle_time";
+ else
+ orderQuery.orderQueryType = "create_time";
orderQuery.orderScene = 2;
orderQuery.pageNo = page;
orderQuery.pageSize = 100;
@@ -129,18 +141,21 @@
* @param appSecret
* @return
*/
- public static List<TaoBaoOrder> getTaoBaoAllOrder(String startTime, String appKey, String appSecret) {
+ public static List<TaoBaoOrder> getTaoBaoAllOrder(String startTime, String appKey, String appSecret, int tkStatus) {
- return getTaoBaoAllOrder(startTime, 1200, 1, appKey, appSecret);
+ return getTaoBaoAllOrder(startTime, 1200, 1, tkStatus, appKey, appSecret);
}
- public static List<TaoBaoOrder> getTaoBaoAllOrder(String startTime, int span, int page, String appKey,
+ public static List<TaoBaoOrder> getTaoBaoAllOrder(String startTime, int span, int page, int tkStatus, String appKey,
String appSecret) {
OrderQuery orderQuery = new OrderQuery();
orderQuery.startTime = startTime;
orderQuery.span = span;
- orderQuery.tkStatus = 1;
- orderQuery.orderQueryType = "create_time";
+ orderQuery.tkStatus = tkStatus;
+ if (tkStatus == TK_STATUS_SETTLEMENT)
+ orderQuery.orderQueryType = "settle_time";
+ else
+ orderQuery.orderQueryType = "create_time";
orderQuery.orderScene = 1;
orderQuery.pageNo = page;
orderQuery.pageSize = 100;
@@ -158,13 +173,16 @@
* @param appSecret
* @return
*/
- public static List<TaoBaoOrder> getTaoBaoThirdAllOrder(String startTime, int span, int page, String appKey,
- String appSecret) {
+ public static List<TaoBaoOrder> getTaoBaoThirdAllOrder(String startTime, int span, int page, int tkStatus,
+ String appKey, String appSecret) {
OrderQuery orderQuery = new OrderQuery();
orderQuery.startTime = startTime;
orderQuery.span = span;
- orderQuery.tkStatus = 1;
- orderQuery.orderQueryType = "create_time";
+ orderQuery.tkStatus = tkStatus;
+ if (tkStatus == TK_STATUS_SETTLEMENT)
+ orderQuery.orderQueryType = "settle_time";
+ else
+ orderQuery.orderQueryType = "create_time";
orderQuery.orderScene = 1;
orderQuery.pageNo = page;
orderQuery.pageSize = 100;
@@ -376,14 +394,14 @@
return orderList;
}
- private static List<TaoBaoOrder> getSpecialOrder(long startTime, int span) {
+ private static List<TaoBaoOrder> getSpecialOrder(long startTime, int span, int tkStatus) {
int page = 1;
String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
- List<TaoBaoOrder> orderList = getTaoBaoSpecialOrder(startTimeStr, span, page, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ List<TaoBaoOrder> orderList = getTaoBaoSpecialOrder(startTimeStr, span, page, tkStatus,
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
while (orderList.size() == 100 * page) {
page++;
- List<TaoBaoOrder> tempOrderList = getTaoBaoSpecialOrder(startTimeStr, span, page,
+ List<TaoBaoOrder> tempOrderList = getTaoBaoSpecialOrder(startTimeStr, span, page, tkStatus,
TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
@@ -398,14 +416,14 @@
* @param span
* @return
*/
- private static List<TaoBaoOrder> getThirdTSpecialOrder(long startTime, int span) {
+ private static List<TaoBaoOrder> getThirdTSpecialOrder(long startTime, int span, int tkStatus) {
int page = 1;
String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
- List<TaoBaoOrder> orderList = getTaoBaoSpecialThirdOrder(startTimeStr, span, page,
+ List<TaoBaoOrder> orderList = getTaoBaoSpecialThirdOrder(startTimeStr, span, page, tkStatus,
TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
while (orderList.size() == 100 * page) {
page++;
- List<TaoBaoOrder> tempOrderList = getTaoBaoSpecialThirdOrder(startTimeStr, span, page,
+ List<TaoBaoOrder> tempOrderList = getTaoBaoSpecialThirdOrder(startTimeStr, span, page, tkStatus,
TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
@@ -413,14 +431,14 @@
return orderList;
}
- private static List<TaoBaoOrder> getRelationOrder(long startTime, int span) {
+ private static List<TaoBaoOrder> getRelationOrder(long startTime, int span, int tkStatus) {
int page = 1;
String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
- List<TaoBaoOrder> orderList = getTaoBaoRelationOrder(startTimeStr, span, page,
+ List<TaoBaoOrder> orderList = getTaoBaoRelationOrder(startTimeStr, span, page, tkStatus,
TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
while (orderList.size() == 100 * page) {
page++;
- List<TaoBaoOrder> tempOrderList = getTaoBaoRelationOrder(startTimeStr, span, page,
+ List<TaoBaoOrder> tempOrderList = getTaoBaoRelationOrder(startTimeStr, span, page, tkStatus,
TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
@@ -428,14 +446,14 @@
return orderList;
}
- private static List<TaoBaoOrder> getThirdRelationOrder(long startTime, int span) {
+ private static List<TaoBaoOrder> getThirdRelationOrder(long startTime, int span, int tkStatus) {
int page = 1;
String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
- List<TaoBaoOrder> orderList = getTaoBaoRelationThirdOrder(startTimeStr, span, page,
+ List<TaoBaoOrder> orderList = getTaoBaoRelationThirdOrder(startTimeStr, span, page, tkStatus,
TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
while (orderList.size() == 100 * page) {
page++;
- List<TaoBaoOrder> tempOrderList = getTaoBaoRelationThirdOrder(startTimeStr, span, page,
+ List<TaoBaoOrder> tempOrderList = getTaoBaoRelationThirdOrder(startTimeStr, span, page, tkStatus,
TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
@@ -450,7 +468,7 @@
* @param endTime
* @return
*/
- public static List<TaoBaoOrder> getSpecialOrder(long startTime, long endTime) {
+ public static List<TaoBaoOrder> getSpecialOrder(long startTime, long endTime, int tkStatus) {
List<TaoBaoOrder> orderList = new ArrayList<>();
long span = (endTime - startTime) % 1000 == 0 ? (endTime - startTime) / 1000 : (endTime - startTime) / 1000 + 1;
int count = (int) (span / 1200);
@@ -464,7 +482,7 @@
if (s < 60)
s = 60;
}
- List<TaoBaoOrder> tempOrderList = getSpecialOrder(startT, s);
+ List<TaoBaoOrder> tempOrderList = getSpecialOrder(startT, s, tkStatus);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
}
@@ -478,7 +496,7 @@
* @param endTime
* @return
*/
- public static List<TaoBaoOrder> getThirdSpecialOrder(long startTime, long endTime) {
+ public static List<TaoBaoOrder> getThirdSpecialOrder(long startTime, long endTime, int tkStatus) {
List<TaoBaoOrder> orderList = new ArrayList<>();
long span = (endTime - startTime) % 1000 == 0 ? (endTime - startTime) / 1000 : (endTime - startTime) / 1000 + 1;
int count = (int) (span / 1200);
@@ -492,7 +510,7 @@
if (s < 60)
s = 60;
}
- List<TaoBaoOrder> tempOrderList = getThirdTSpecialOrder(startT, s);
+ List<TaoBaoOrder> tempOrderList = getThirdTSpecialOrder(startT, s, tkStatus);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
}
@@ -506,7 +524,7 @@
* @param endTime
* @return
*/
- public static List<TaoBaoOrder> getRelationOrder(long startTime, long endTime) {
+ public static List<TaoBaoOrder> getRelationOrder(long startTime, long endTime, int tkStatus) {
List<TaoBaoOrder> orderList = new ArrayList<>();
long span = (endTime - startTime) % 1000 == 0 ? (endTime - startTime) / 1000 : (endTime - startTime) / 1000 + 1;
int count = (int) (span / 1200);
@@ -520,7 +538,7 @@
if (s < 60)
s = 60;
}
- List<TaoBaoOrder> tempOrderList = getRelationOrder(startT, s);
+ List<TaoBaoOrder> tempOrderList = getRelationOrder(startT, s, tkStatus);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
}
@@ -534,7 +552,7 @@
* @param endTime
* @return
*/
- public static List<TaoBaoOrder> getThirdRelationOrder(long startTime, long endTime) {
+ public static List<TaoBaoOrder> getThirdRelationOrder(long startTime, long endTime, int tkStatus) {
List<TaoBaoOrder> orderList = new ArrayList<>();
long span = (endTime - startTime) % 1000 == 0 ? (endTime - startTime) / 1000 : (endTime - startTime) / 1000 + 1;
int count = (int) (span / 1200);
@@ -548,7 +566,7 @@
if (s < 60)
s = 60;
}
- List<TaoBaoOrder> tempOrderList = getThirdRelationOrder(startT, s);
+ List<TaoBaoOrder> tempOrderList = getThirdRelationOrder(startT, s, tkStatus);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
}
@@ -561,6 +579,7 @@
orderQuery.orderQueryType = "settle_time";
orderQuery.orderScene = 1;
orderQuery.pageSize = 100;
+ orderQuery.tkStatus=TK_STATUS_SETTLEMENT;
int page = 1;
orderQuery.pageNo = page;
if (third)
--
Gitblit v1.8.0