模板点击详情文案修改

models/industrial_management.go

@@ -457,7 +457,7 @@ func GetActivityIdListBySubjecName(subjectName string) (items []*ActivityIdRep,
 }
 
 //通过id 获取详情
-func GetIndustrialManagemenDetailByAaticleID(articleId int) (item *IndustrialManagementRep, err error) {
+func GetIndustrialManagemenDetailByAaticleID(articleId int) (items []*IndustrialManagementRep, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 			article_id,
@@ -467,6 +467,6 @@ func GetIndustrialManagemenDetailByAaticleID(articleId int) (item *IndustrialMan
 			INNER JOIN cygx_industrial_management AS m ON mg.industrial_management_id = m.industrial_management_id 
 		WHERE
 			mg.article_id = ? `
-	err = o.Raw(sql, articleId).QueryRow(&item)
+	_, err = o.Raw(sql, articleId).QueryRows(&items)
 	return
 }

models/wx_user_code.go

@@ -125,7 +125,7 @@ type CygxXzsChooseSend struct {
 //获取提交过推送规则用户的userId
 func GetCygxXzsChooseSend() (items []*CygxXzsChooseSend, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT user_id FROM cygx_xzs_choose_send `
+	sql := `SELECT * FROM cygx_xzs_choose_send `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

services/article.go

@@ -1148,7 +1148,7 @@ func HandleArticleListByApi(artcleId, celuePushId int) (err error) {
 }
 
 //func init() {
-//	DoArticleOnenIdWxTemplateMsg(6956)
+//	DoArticleOnenIdWxTemplateMsg(6940)
 //}
 
 //过滤策略平台报告，研选报告重复推送，以及权限勾选的推送
@@ -1244,11 +1244,14 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 	//文章关联的产业
 	var industryName string
 	if chartPermissionId != utils.CE_LUE_ID {
-		detailIndustryName, err := models.GetIndustrialManagemenDetailByAaticleID(articleId)
-		if err != nil {
+		detailIndustryNameList, err := models.GetIndustrialManagemenDetailByAaticleID(articleId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			return err
 		}
-		industryName = detailIndustryName.IndustryName
+		for _, v := range detailIndustryNameList {
+			industryName += v.IndustryName + ","
+		}
+		industryName = strings.TrimRight(industryName, ",")
 	} else {
 		industryName = reportMapDetail.SubCategoryName
 	}

services/wx_template_msg.go

@@ -520,12 +520,13 @@ func SendWxMsgWithArticleUpdate(first, keyWord1, keyWord2, keyWord3, keyWord4 st
 	sendData["keyword2"] = map[string]interface{}{"value": keyWord2, "color": "#173177"}
 	sendData["keyword3"] = map[string]interface{}{"value": keyWord3, "color": "#173177"}
 	sendData["keyword4"] = map[string]interface{}{"value": keyWord4, "color": "#173177"}
+	sendData["remark"] = map[string]interface{}{"value": "点击查看活动详情", "color": "#173177"}
 	sendMap["data"] = sendData
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList, strconv.Itoa(articleId), utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD)
 	return
 }
 
-//周日下午4点半，推送全部活
+//周日下午4点半，推送全部活动
 func SendActivityOnenIdWxTemplateMsg(first, keyWord1, keyWord2, keyWord3, keyWord4 string, openIdList []*models.OpenIdList) (err error) {
 	var msg string
 	defer func() {
@@ -551,13 +552,14 @@ func SendActivityOnenIdWxTemplateMsg(first, keyWord1, keyWord2, keyWord3, keyWor
 	sendMap := make(map[string]interface{})
 	sendData := make(map[string]interface{})
 	sendMap["template_id"] = templateId
-	//sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId, "pagepath": "pageMy/reportDetail/reportDetail?id=" + strconv.Itoa(articleId)}
-	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId}
+	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId, "pagepath": "pages/activity/activity"}
+	//sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId}
 	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
 	sendData["keyword1"] = map[string]interface{}{"value": keyWord1, "color": "#173177"}
 	sendData["keyword2"] = map[string]interface{}{"value": keyWord2, "color": "#173177"}
 	sendData["keyword3"] = map[string]interface{}{"value": keyWord3, "color": "#173177"}
 	sendData["keyword4"] = map[string]interface{}{"value": keyWord4, "color": "#173177"}
+	sendData["remark"] = map[string]interface{}{"value": "点击查看下周活动列表", "color": "#173177"}
 	sendMap["data"] = sendData
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList, "", utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD)
 	return