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

controllers/cygx/activity.go

@@ -9,6 +9,7 @@ import (
 	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/services"
 	cygxService "hongze/hz_crm_api/services/cygx"
+	"hongze/hz_crm_api/services/elastic"
 	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
@@ -761,14 +762,18 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 			br.ErrMsg = "发布失败,Err:" + err.Error()
 			return
 		}
-
 		//如果是添加多条活动那么就推送多次
 		for _, v := range activityIdArr {
 			if req.DoType == 1 {
-				go cygxService.DoActivityOnenIdWxTemplateMsg(v)
-				go cygxService.UpdateResourceData(v, "activity", "add", time.Now().Format(utils.FormatDateTime))
-				go cygxService.YiDongSaveRoadshowDetail(v)
-				go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(v, AdminUser.AdminId, 1) //活动发布以及取消发布处理研选扣点
+				go func() {
+					//同时添加多个活动的时候，避免协程开的过多
+					cygxService.DoActivityOnenIdWxTemplateMsg(v)
+					cygxService.UpdateResourceData(v, "activity", "add", time.Now().Format(utils.FormatDateTime))
+					cygxService.YiDongSaveRoadshowDetail(v)
+					cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(v, AdminUser.AdminId, 1) //活动发布以及取消发布处理研选扣
+					elastic.AddComprehensiveActivity(v)
+				}()
+
 			}
 			go cygxService.MakeActivitySigninImg(v)
 		}
@@ -778,8 +783,11 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 			go cygxService.UpdateResourceData(req.ActivityId, "activity", "add", time.Now().Format(utils.FormatDateTime))
 			go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(activityId, AdminUser.AdminId, 1) //活动发布以及取消发布处理研选扣点
 		}
+		//如果二次编辑的时候，取消了易董办会选项，那么就对易董发送取消发布到广场的通知
+		if req.IsYidongConduct == 0 {
+			go cygxService.YiDongUpdateActivityStatus(activityId)
+		}
 	}
-
 	// 查研观向7.4-更新产业布局时间
 	if len(industryIds) > 0 {
 		go cygxService.UpdateIndustryLayoutTime(industryIds, false)
@@ -1244,6 +1252,11 @@ func (this *ActivityCoAntroller) PublishAndCancel() {
 		go cygxService.YiDongUpdateActivityPublish(activityId)
 	}
 	go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(activityId, AdminUser.AdminId, item.PublishStatus) //活动发布以及取消发布处理研选扣点
+<<<<<<< HEAD
+=======
+
+	go elastic.AddComprehensiveActivity(activityId) // 同步Es添加活动
+>>>>>>> 5df9e1d015c7823cef235d1c282bb463bb6de00b
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

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)
@@ -685,14 +685,22 @@ func YiDongUpdateActivityStatus(activityId int) {
 	if activityInfo.ActivityTypeId == 7 {
 		activityInfo.PublishStatus = 0
 	}
+	//如果关联的易董活动ID为空，那么不做处理
+	if activityInfo.YidongActivityIdByCygx == "" {
+		return
+	}
+	//如果状态是已发布，而且是易董办会那么就不做处理
+	if activityInfo.IsYidongConduct == 1 && activityInfo.PublishStatus == 1 {
+		return
+	}
 	token, _ := GetYidongToken()
 	if token == "" {
 		return
 	}
 	url := utils.YiDongZhengTongYunUrl + "interact/activityThirdApi/updateActivityStatus" + "?access_token=" + token
-	if activityInfo.IsYidongConduct == 0 || activityInfo.YidongActivityIdByCygx == "" {
-		return
-	}
+	//if activityInfo.IsYidongConduct == 0 || activityInfo.YidongActivityIdByCygx == "" {
+	//	return
+	//}
 	params := YiDongUpdateActivityPublishResp{
 		Id: activityInfo.YidongActivityIdByCygx,
 	}

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 {