no message

controllers/activity.go

@@ -20,7 +20,6 @@ type ActivityNoLoginController struct {
 	BaseAuthMobileController
 }
 
-
 // @Title 活动类型下的主题列表
 // @Description 获取活动类型下的主题列表接口
 // @Param   ChartPermissionIds   query   string  false     "行业id 多个用 , 隔开"
@@ -264,6 +263,8 @@ func (this *ActivityNoLoginController) 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 )` // 研选活动结束后就不在已结束页面展示了
 	}
 
 	//行业名称
@@ -400,8 +401,8 @@ func (this *ActivityNoLoginController) 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  `
 	}
 
@@ -2483,4 +2484,4 @@ func (this *ActivityController) ActivityVoiceHistoryAdd() {
 	br.Success = true
 	br.Msg = "操作成功"
 	return
-}
+}

models/activity.go

@@ -267,7 +267,7 @@ type CygxActivityResp struct {
 // 列表
 func GetCygxActivityList(condition string, pars []interface{}, sortTime string, startSize, pageSize int) (items []*CygxActivity, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT	activity_id,city, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id , activity_type_id,is_external_label,is_research_points
+	sql := `SELECT	activity_id,chart_permission_id, city, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id , activity_type_id,is_external_label,is_research_points
 		FROM cygx_activity as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

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

@@ -177,7 +177,7 @@ const (
 	WX_MSG_PATH_ACTIVITY_INDUSTRYR_EPORT = "reportPages/IndustryReport/IndustryReport?id="   //产业文章列表模板消息地址
 	WX_MSG_PATH_ACTIVITY_DETAIL          = "activityPages/activityDetail/activityDetail?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="   //用户提交研选调研需求
 )
 
 // 微信模板消息推送公共接口的秘钥