From c583f910aa98c3438430b3d04681e3b11f992e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 4 Feb 2020 14:30:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=94=99=E8=AF=AF=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go     | 11 +++++------
 business/jxutils/tasksch/task.go |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 6cdfb6115..4d4b3087f 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -651,16 +651,15 @@ func buildSetFinishHook(task tasksch.ITask, ctx *jxcontext.Context) {
 			if len(task.GetFailedList()) > 10 {
 				downloadURL, _, _ := WirteToExcelBySyncFailed(task)
 				noticeMsg += fmt.Sprintf("[详情点我]%s/billshow/?normal=true&path=%s  \n", globals.BackstageHost, downloadURL)
-				if authInfo, err := ctx.GetV2AuthInfo(); err == nil {
-					ddmsg.SendUserMessage(dingdingapi.MsgTyeText, authInfo.UserID, "同步错误返回", noticeMsg)
-				}
 			} else if len(task.GetFailedList()) > 0 && len(task.GetFailedList()) <= 10 {
 				if task.GetErr() != nil {
 					noticeMsg += utils.Format4Output(buildErrMsgJson(task), true)
 				}
-				if authInfo, err := ctx.GetV2AuthInfo(); err == nil {
-					ddmsg.SendUserMessage(dingdingapi.MsgTyeText, authInfo.UserID, "同步错误返回", noticeMsg)
-				}
+			} else {
+				noticeMsg = "您的同步任务执行完成，没有错误返回。"
+			}
+			if authInfo, err := ctx.GetV2AuthInfo(); err == nil {
+				ddmsg.SendUserMessage(dingdingapi.MsgTyeText, authInfo.UserID, "同步错误返回", noticeMsg)
 			}
 		} else {
 			if time.Now().Hour() >= 20 || time.Now().Hour() < 7 {
diff --git a/business/jxutils/tasksch/task.go b/business/jxutils/tasksch/task.go
index a9735d88e..89f407e4a 100644
--- a/business/jxutils/tasksch/task.go
+++ b/business/jxutils/tasksch/task.go
@@ -475,7 +475,6 @@ func (t *BaseTask) run(taskHandler func()) {
 			close(t.finishChan)
 			if t.finishHook != nil {
 				t.finishHook(t)
-				SendMessage(t)
 			} else {
 				SendMessage(t)
 			}