Merge branch 'cygx_11.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -1782,6 +1782,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	} else {
 		conditioninit += ` AND ( art.chart_permission_id  !=  ` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `  OR  ( art.is_show_hz = 1 AND art.chart_permission_id  =  ` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `)  )`
 
+		conditioninit += ` AND IF (	 art.active_state = 3, art.chart_permission_id != ` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `, 1 = 1 ) ` //V 11.0 研选活动结束后就不在已结束页面展示了
 	}
 	//行业名称
 	if len(chartPermissionIds) > 0 {
@@ -2284,6 +2285,8 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		chartPermissionIds = strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN)
 	} else {
 		conditioninit += ` AND ( art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `'  OR  ( art.is_show_hz = 1 AND art.chart_permission_id  =  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `')  )`
+
+		conditioninit += ` AND IF (	 art.active_state = 3, art.chart_permission_id != ` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + `, 1 = 1 ) ` //V 11.0 研选活动结束后就不在已结束页面展示了
 	}
 	//行业名称
 	if len(chartPermissionIds) > 0 {

services/activity.go

@@ -2379,6 +2379,11 @@ func ActivityButtonShow(item *models.ActivityDetail) (activityDetail *models.Act
 			activityDetail.IsShowMeetingReminder = true
 			activityDetail.ActivityTypeName = "分析师电话会"
 		}
+
+		//买方线下交流 8 // 查研观向 11.0
+		if activityDetail.ActivityTypeId == 8 {
+			activityDetail.IsShowSignup = true
+		}
 	}
 
 	//如果是易董创建的活动，展示我要报名，不展示预约外呼

services/banner_yx_survey.go

@@ -50,7 +50,7 @@ func SendCygxBannerYxSurveyTemplateMsg(user *models.WxUserItem, content string,
 	msg = fmt.Sprint(user, articleId)
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg("SendCygxBannerYxSurveyTemplateMsg Err"+msg, 2)
+			go utils.SendAlarmMsg("SendCygxBannerYxSurveyTemplateMsg Err"+msg+err.Error(), 2)
 		}
 	}()
 
@@ -95,6 +95,8 @@ func SendCygxBannerYxSurveyTemplateMsg(user *models.WxUserItem, content string,
 	for _, v := range openIdList {
 		openIdArr = append(openIdArr, v.OpenId)
 	}
+
+	fmt.Println(openIdArr)
 	var keyword1 string
 	var keyword2 string
 	var keyword3 string