From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:43:18 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'

---
 fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java |    6 +++---
 1 files changed, 3 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 ad1bd97..e2ce43d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java
@@ -225,7 +225,7 @@
 	public void doJob2() {
 		if (!Constant.IS_TASK)
 			return;
-		doJob4();
+		doTaoBaoWeiQuan();
 
 		orderProcessService.fanli();
 	}
@@ -241,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);
@@ -256,7 +256,7 @@
 
 	// 澶勭悊鍒嗕韩鍟嗗搧鎵�浜х敓鐨勮鍗�
 	@Scheduled(cron = "0 0/2 * * * ? ")
-	public void doJob7() {
+	public void doPidOrder() {
 		if (!Constant.IS_TASK)
 			return;
 		pidOrderService.doPidOrder();

--
Gitblit v1.8.0