From e11b811d07ab56b0a3351979e8f254e56143f9bf Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 19 九月 2019 09:43:04 +0800
Subject: [PATCH] 订单JOB修改
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateCommonOrderJob.java | 36 ++++++------------------------------
1 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateCommonOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateCommonOrderJob.java
index c7b2ae4..7a0ab8a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateCommonOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateCommonOrderJob.java
@@ -25,7 +25,6 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
@@ -76,19 +75,8 @@
* @return
*/
private 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,
- TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- while (orderList.size() == 100 * page) {
- page++;
- List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,
- TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- if (tempOrderList != null && tempOrderList.size() > 0)
- orderList.addAll(tempOrderList);
- }
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, startTime + span * 1000L,
+ 1);
return orderList;
}
@@ -100,19 +88,8 @@
* @return
*/
private List<TaoBaoOrder> getCommonSettleOrder(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,
- TaoKeOrderApiUtil.TK_STATUS_SETTLEMENT, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- while (orderList.size() == 100 * page) {
- page++;
- List<TaoBaoOrder> tempOrderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,
- TaoKeOrderApiUtil.TK_STATUS_SETTLEMENT, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- if (tempOrderList != null && tempOrderList.size() > 0)
- orderList.addAll(tempOrderList);
- }
+ List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(startTime, startTime + span * 1000L,
+ 3);
return orderList;
}
@@ -239,9 +216,8 @@
List<TaoBaoOrder> orderList = taoBaoOrderMapper.listLongTimeNoUpdateOrders(0, 10);
List<TaoBaoOrder> updateOrderList = new ArrayList<>();
for (TaoBaoOrder order : orderList) {
- List<TaoBaoOrder> newList = TaoKeOrderApiUtil.getTaoBaoAllOrder(order.getCreateTime(), 60, 1,
- TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
- TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ long time = TimeUtil.convertToTimeTemp(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+ List<TaoBaoOrder> newList = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(time, time + 60 * 1000L, 1);
for (TaoBaoOrder o : newList) {
if (o.getOrderId().equalsIgnoreCase(order.getOrderId()))
updateOrderList.add(o);
--
Gitblit v1.8.0