From ca3c02c1cea52a91c4042ebbea9631c23d6af842 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 20 八月 2019 15:38:11 +0800
Subject: [PATCH] 自动选品，爬单bug修改
---
fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateCommonOrderJob.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 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 46c3d50..f6425a7 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
@@ -21,7 +21,6 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
-import com.yeshi.fanli.util.BeanUtil;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -80,11 +79,37 @@
int page = 1;
String startTimeStr = TimeUtil.getGernalTime(startTime, "yyyy-MM-dd HH:mm:ss");
List<TaoBaoOrder> orderList = TaoKeOrderApiUtil.getTaoBaoAllOrder(startTimeStr, span, page,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ 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,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ if (tempOrderList != null && tempOrderList.size() > 0)
+ orderList.addAll(tempOrderList);
+ }
+ return orderList;
+ }
+
+ /**
+ * 鑾峰彇缁撶畻璁㈠崟
+ *
+ * @param startTime
+ * @param span
+ * @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);
}
@@ -202,6 +227,9 @@
long startTime = System.currentTimeMillis();
// 30s鐖彇涓�娆¤繎5鍒嗛挓鐨�
List<TaoBaoOrder> orderList = getCommonOrder(startTime, 300);
+ List<TaoBaoOrder> settleOrderList = getCommonSettleOrder(startTime, 300);
+ if (settleOrderList != null && settleOrderList.size() > 0)
+ orderList.addAll(settleOrderList);
addOrderNew(orderList);
}
@@ -212,7 +240,8 @@
List<TaoBaoOrder> updateOrderList = new ArrayList<>();
for (TaoBaoOrder order : orderList) {
List<TaoBaoOrder> newList = TaoKeOrderApiUtil.getTaoBaoAllOrder(order.getCreateTime(), 60, 1,
- TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
for (TaoBaoOrder o : newList) {
if (o.getOrderId().equalsIgnoreCase(order.getOrderId()))
updateOrderList.add(o);
--
Gitblit v1.8.0