no message

controllers/activity.go

@@ -867,7 +867,6 @@ func (this *ActivityCoAntroller) SignupAdd() {
 		resp.IsResearch = true
 	}
 
-
 	//公司线下调研活动客户报名后给建会人，所属销售推送模板信息
 	if signupStatus == "Success" {
 		go services.SendResearchActivitiesTemplateMsg(user, activityInfo)
@@ -1010,7 +1009,7 @@ func (this *ActivityCoAntroller) SignupCancel() {
 	if activityInfo.ActivityTypeId == 5 {
 		go services.SendActivitieCancelSignTemplateMsg(user, activityInfo)
 	}
-	
+
 	go services.YanXuanActivityPointsBillSignupCancel(activityId, uid) // 用户取消报名添加到处理研选扣点
 	br.Ret = 200
 	br.Success = true
@@ -1781,6 +1780,8 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		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 ( art.chart_permission_id  !=  '` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + ` AND art.active_state  != 3 )` // 研选活动结束后就不在已结束页面展示了
 	}
 	//行业名称
 	if len(chartPermissionIds) > 0 {
@@ -1922,8 +1923,8 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	if label != "" && activeState == "1" {
 		conditionOrder = ` ORDER BY art.activity_time ASC  `
 	}
-
-	if activeState == "1" {
+	//未开始进行中默认按照时间正序
+	if activeState == "1" || activeState == "1,2" {
 		conditionOrder = ` ORDER BY art.activity_time ASC  `
 	}
 	//conditionActivityKey += condition + conditionOrder

services/article_apply_appointment_expert.go

@@ -98,7 +98,7 @@ func SendArticleApplyAppointmentExpertTemplateMsg(user *models.WxUserItem, artic
 	sendInfo.Keyword3 = keyword3
 	sendInfo.Keyword4 = keyword4
 	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ACTIVITY_ADD
-	sendInfo.TemplateId = utils.WxMsgTemplateIdArticleUserRemind
+	sendInfo.TemplateId = utils.WxMsgTemplateIdApplyXzs
 	sendInfo.RedirectUrl = redirectUrl
 	sendInfo.RedirectTarget = 3
 	sendInfo.Resource = strconv.Itoa(articleId)

services/banner_yx_survey.go

@@ -86,7 +86,7 @@ func SendCygxBannerYxSurveyTemplateMsg(user *models.WxUserItem, content string,
 	keyword3 = time.Now().Format(utils.FormatDateTime)
 	keyword4 = fmt.Sprint("研选调研需求：", content)
 	var redirectUrl string
-	if utils.RunMode == "" {
+	if utils.RunMode == "release" {
 		redirectUrl = utils.WX_MSG_PATH_YX_SURVEY_DETAIL + strconv.Itoa(articleId)
 	}
 	sendInfo := new(SendWxTemplate)
@@ -95,7 +95,7 @@ func SendCygxBannerYxSurveyTemplateMsg(user *models.WxUserItem, content string,
 	sendInfo.Keyword3 = keyword3
 	sendInfo.Keyword4 = keyword4
 	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ACTIVITY_ADD
-	sendInfo.TemplateId = utils.WxMsgTemplateIdArticleUserRemind
+	sendInfo.TemplateId = utils.WxMsgTemplateIdApplyXzs
 	sendInfo.RedirectUrl = redirectUrl
 	sendInfo.RedirectTarget = 3
 	sendInfo.Resource = strconv.Itoa(articleId)

utils/constants.go

@@ -180,7 +180,7 @@ const (
 	WX_MSG_PATH_RESEARCHTHEME_DETAIL     = "reportPages/researchTheme/researchTheme?id="                  //主题详情模板消息地址
 	WX_MSG_PATH_ACTIVITY_SIGN            = "pages-message/activityTemplate/activityTemplate?id="          //活动模板消息地址
 	WX_MSG_PATH_APPLY_DETAIL             = "pages-message/applyFor/applyFor?id="                          //潜在用户试用权限申请
-	WX_MSG_PATH_YX_SURVEY_DETAIL         = "pageMy/reportDetail/reportDetail?id="                         //文章详情模板消息地址
+	WX_MSG_PATH_YX_SURVEY_DETAIL         = "pages-purchaser/survey/surveyDetail?suveryId="                //用户提交研选调研需求
 )
 
 //2：文章详情  https://web.hzinsights.com/material/info/8436  小程序路径：/pageMy/reportDetail/reportDetail?id=