From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1

---
 fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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..ad1bd97 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);
@@ -258,4 +262,10 @@
 		pidOrderService.doPidOrder();
 	}
 
+	// 姣�6涓皬鏃舵墽琛屼竴娆�
+	@Scheduled(cron = "0 0 0/6 * * ? ")
+	public void doLostOrder() {
+		lostOrderService.processFail();
+	}
+
 }

--
Gitblit v1.8.0