From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
index c24cf96..e2ce43d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
@@ -19,6 +19,7 @@
import com.yeshi.fanli.service.inter.common.DataMonitorService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleGiftService;
+import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.PidOrderService;
@@ -27,6 +28,8 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
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.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBao110Util;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
@@ -68,6 +71,12 @@
@Resource
private DataMonitorService dataMonitorService;
+
+ @Resource
+ private RedisManager redisManager;
+
+ @Resource
+ private LostOrderService lostOrderService;
private void updateOrder(long startTime, long endTime) {
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
@@ -122,7 +131,25 @@
while (its.hasNext()) {
String key = its.next();
List<TaoBaoOrder> orders = map.get(key);
+ String redisKey = "addorderqueue-" + key;
+ // redis鍋氶鐜囬檺鍒�
+ try {
+ if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) {
+ continue;
+ }
+
+ } catch (Exception e) {
+
+ }
+
CMQManager.getInstance().addTaoBaoOrderMsg(key, orders);
+
+ try {
+ // 6灏忔椂鍐呬笉鍐嶅鐞�
+ redisManager.cacheCommonString(redisKey, "1", 60 * 60 * 6);
+ } catch (Exception e) {
+
+ }
}
}
} catch (Exception e) {
@@ -198,7 +225,7 @@
public void doJob2() {
if (!Constant.IS_TASK)
return;
- doJob4();
+ doTaoBaoWeiQuan();
orderProcessService.fanli();
}
@@ -214,7 +241,7 @@
// 缁存潈璁㈠崟澶勭悊-澶勭悊鏈�杩�60澶╃殑
// 30鍒嗛挓涓�娆�
@Scheduled(cron = "0 0/30 * * * ? ")
- public void doJob4() {
+ public void doTaoBaoWeiQuan() {
if (!Constant.IS_TASK)
return;
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
@@ -229,10 +256,16 @@
// 澶勭悊鍒嗕韩鍟嗗搧鎵�浜х敓鐨勮鍗�
@Scheduled(cron = "0 0/2 * * * ? ")
- public void doJob7() {
+ public void doPidOrder() {
if (!Constant.IS_TASK)
return;
pidOrderService.doPidOrder();
}
+ // 姣�6涓皬鏃舵墽琛屼竴娆�
+ @Scheduled(cron = "0 0 0/6 * * ? ")
+ public void doLostOrder() {
+ lostOrderService.processFail();
+ }
+
}
--
Gitblit v1.8.0