From c84d8ecd97d111b01db9cfd807300d0491a95bc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 08 一月 2019 16:38:34 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 87a3f5f..72cc5f6 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;
@@ -73,6 +74,9 @@
@Resource
private RedisManager redisManager;
+
+ @Resource
+ private LostOrderService lostOrderService;
private void updateOrder(long startTime, long endTime) {
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
@@ -221,7 +225,7 @@
public void doJob2() {
if (!Constant.IS_TASK)
return;
- doJob4();
+ doTaoBaoWeiQuan();
orderProcessService.fanli();
}
@@ -237,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);
@@ -250,12 +254,18 @@
orderProcessService.weiQuanOrder(orderList);
}
- // 澶勭悊鍒嗕韩鍟嗗搧鎵�浜х敓鐨勮鍗�
- @Scheduled(cron = "0 0/2 * * * ? ")
- public void doJob7() {
- if (!Constant.IS_TASK)
- return;
- pidOrderService.doPidOrder();
+ // 澶勭悊鍒嗕韩鍟嗗搧鎵�浜х敓鐨勮鍗�(鍚庣画鐗堟湰搴熼櫎)
+ // @Scheduled(cron = "0 0/2 * * * ? ")
+ // 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