From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java
index 6c37c85..1c68f15 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java
@@ -10,6 +10,7 @@
import org.springframework.scheduling.annotation.Scheduled;
+import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.log.LogHelper;
@@ -20,10 +21,12 @@
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;
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;
@@ -63,6 +66,9 @@
@Resource
private OrderService orderService;
+ @Resource
+ private TaoBaoOrderMapper taoBaoOrderMapper;
+
/**
* 鏂扮増鑾峰彇鏅�氳鍗�
*
@@ -74,11 +80,11 @@
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);
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.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);
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
if (tempOrderList != null && tempOrderList.size() > 0)
orderList.addAll(tempOrderList);
}
@@ -207,4 +213,20 @@
addOrderNew(orderList);
}
+ // 姣忔櫄10鐐规墽琛屾紡鍗�
+ @Scheduled(cron = "0 0 22 * * ? ")
+ public void doJob3() {
+ 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,
+ TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ for (TaoBaoOrder o : newList) {
+ if (o.getOrderId().equalsIgnoreCase(order.getOrderId()))
+ updateOrderList.add(o);
+ }
+ }
+ addOrderNew(updateOrderList);
+ }
+
}
--
Gitblit v1.8.0