Merge branch 'cygx_9.3' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -3819,7 +3819,7 @@ func (this *ActivityCoAntroller) SpecialSignupAdd() {
 			}
 
 			//用户专项调研操作行为，模板消息推送
-			go services.SpecialActivityUserRemind(user, activityInfo, 1)
+			//go services.SpecialActivityUserRemind(user, activityInfo, 1)
 
 			//用户相关行为，给对应销售发模板消息
 			go services.ActivitySpecialUserRmind(user, activityId, 1)

services/micro_roadshow.go

@@ -671,8 +671,8 @@ func MicroRoadshowVideoUserRmind(user *models.WxUserItem, videoId int) (err erro
 		}
 		first = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：播放微路演详视频")
 		keyword1 = videoInfo.VideoName
-		keyword2 = "__"
-		remark = "微路演详情"
+		keyword2 = "--"
+		remark = "点击查看微路演详情"
 		openIdArr := make([]string, 0)
 		for _, v := range openIdList {
 			openIdArr = append(openIdArr, v.OpenId)

services/wx_template_msg.go

@@ -229,14 +229,17 @@ func SendWxMsgWithArticleUserRemind(keyWord1, keyWord2 string, openIdList []*mod
 	var first string
 	first = keyWord1
 	keyword1 := keyWord2
+	remark := "点击查看报告详情"
 	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
 	templateId := utils.WxMsgTemplateIdArticleUserRemind
 	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, "pagepath": utils.WX_MSG_PATH_ARTICLE_DETAIL + strconv.Itoa(articleId)}
 	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
 	sendData["keyword1"] = map[string]interface{}{"value": keyword1, "color": "#173177"}
+	sendData["keyword2"] = map[string]interface{}{"value": "--", "color": "#173177"}
+	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
 	sendMap["data"] = sendData
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList, strconv.Itoa(articleId), utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD)
 	return