Merge branch 'cygx/cygx_need_p2_800' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

services/company_approval_message.go

@@ -212,6 +212,9 @@ func AddCompanyApprovalMessageRai(companyId, companyContractId int, applyRealNam
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return err
 	}
+	if len(openIdList) == 0 {
+		return
+	}
 	go SendWxMsgWithRaiSell(first, keyword1, keyword2, keyword3, keyword4, openIdList)
 	return
 }
@@ -246,6 +249,9 @@ func AddCompanyApprovalMessageWangYang(companyId, companyContractId int, applyRe
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return err
 	}
+	if len(openIdList) == 0 {
+		return
+	}
 	go SendWxMsgWithRaiWangYang(keyword1, keyword2, keyword3, keyword4, openIdList)
 	return
 }

services/cygx/yidong.go

@@ -670,7 +670,7 @@ func YiDongUpdateActivityStatus(activityId int) {
 	defer func() {
 		if err != nil {
 			fmt.Println(err)
-			go alarm_msg.SendAlarmMsg("发布路演到活动广场（新）；err："+err.Error(), 3)
+			go alarm_msg.SendAlarmMsg(" 删除路演活动（新）；err："+err.Error(), 3)
 		}
 	}()
 	activityInfo, err := cygx.GetAddActivityInfoById(activityId)

services/elastic/es_comprehensive.go

@@ -12,6 +12,7 @@ import (
 	"html"
 	"strconv"
 	"strings"
+	"time"
 )
 
 type ElasticComprehensiveDetail struct {
@@ -138,6 +139,7 @@ func EsDeleteComprehensiveData(item *ElasticComprehensiveDetail) (err error) {
 
 // ES添加文章：报告、纪要
 func AddComprehensiveArticle(sourceId int) {
+	time.Sleep(3 * time.Second) // 延迟三秒处理
 	var err error
 	defer func() {
 		if err != nil {
@@ -176,6 +178,7 @@ func AddComprehensiveArticle(sourceId int) {
 
 // Es添加活动
 func AddComprehensiveActivity(sourceId int) {
+	time.Sleep(3 * time.Second) // 延迟三秒处理
 	var err error
 	defer func() {
 		if err != nil {
@@ -229,6 +232,7 @@ func AddComprehensiveActivity(sourceId int) {
 
 // Es添加专项调研活动
 func AddComprehensiveActivitySpecial(sourceId int) {
+	time.Sleep(3 * time.Second) // 延迟三秒处理
 	var err error
 	defer func() {
 		if err != nil {
@@ -286,6 +290,7 @@ func AddComprehensiveActivitySpecial(sourceId int) {
 
 // Es添加活动视频
 func AddComprehensiveActivityVideo(activityId int) {
+	time.Sleep(3 * time.Second) // 延迟三秒处理
 	var err error
 	defer func() {
 		if err != nil {
@@ -344,6 +349,7 @@ func AddComprehensiveActivityVideo(activityId int) {
 
 // Es添加活动音频
 func AddComprehensiveActivityVoice(activityId int) {
+	time.Sleep(3 * time.Second) // 延迟三秒处理
 	var err error
 	defer func() {
 		if err != nil {
@@ -403,6 +409,7 @@ func AddComprehensiveActivityVoice(activityId int) {
 
 // Es添加微路演
 func AddComprehensiveRoadshow(sourceId int) {
+	time.Sleep(3 * time.Second) // 延迟三秒处理
 	var err error
 	defer func() {
 		if err != nil {
@@ -432,6 +439,7 @@ func AddComprehensiveRoadshow(sourceId int) {
 
 // Es添加晨会精华
 func AddComprehensiveMeetingreviewchapt(sourceId int) {
+	time.Sleep(3 * time.Second) // 延迟三秒处理
 	var err error
 	defer func() {
 		if err != nil {
@@ -463,6 +471,7 @@ func AddComprehensiveMeetingreviewchapt(sourceId int) {
 
 // Es删除晨会精华
 func DeleteComprehensiveMeetingreviewchapt(sourceId int) {
+	time.Sleep(3 * time.Second) // 延迟三秒处理
 	var err error
 	defer func() {
 		if err != nil {
@@ -479,6 +488,7 @@ func DeleteComprehensiveMeetingreviewchapt(sourceId int) {
 
 // 添加产业资源包
 func AddComprehensiveIndustrialSource(sourceType string, articleId int) {
+	time.Sleep(3 * time.Second) // 延迟三秒处理
 	var err error
 	defer func() {
 		if err != nil {