Merge branch 'mfyx_3.4' of http://8.136.199.33:3000/cxzhang/hongze_web_mfyx into debug

controllers/yanxuan_special_message.go

@@ -84,16 +84,18 @@ func (this *YanxuanSpecialMessageController) MessageAdd() {
 		br.ErrMsg = "留言失败，Err:" + err.Error()
 		return
 	}
-
+	var msgText string
 	if parentId == 0 {
+		msgText = "留言成功"
 		go services.SendWxCategoryMsgByYanxuanSpecialMassageByAuthor(content, yanxuanSpecialBySpeciaDetail)
 	} else {
+		msgText = "回复成功"
 		go services.SendWxCategoryMsgByYanxuanSpecialMassage(parentId, int(messageId), content, yanxuanSpecialBySpeciaDetail)
 	}
 
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "留言成功"
+	br.Msg = msgText
 }
 
 // @Title 留言管理列表

services/cygx_activity_video_history.go

@@ -110,9 +110,9 @@ func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds in
 
 // 记录用户活动音频播放记录
 func AddActivityVoiceHistory(user *models.WxUserItem, activityId, playSeconds int, inviteShareCode string) {
-	if playSeconds == 0 {
-		return
-	}
+	//if playSeconds == 0 {
+	//	return
+	//}
 	key := utils.CYGX_VIDEO_HISTORY_KEY + utils.CYGX_OBJ_ACTIVITYVOICE + strconv.Itoa(activityId) + "_" + strconv.Itoa(user.UserId)
 
 	var err error

services/wechat_send_category_template_msg.go

@@ -844,7 +844,7 @@ func SendWxCategoryMsgByYanxuanSpecialMassageByAuthor(content string, yanxuanSpe
 	var mobile string
 	//mobile = utils.WxMsgTemplateIdAskMsgMobilePublic
 	keyword1 = "专栏文章有新的留言"
-	keyword2 = content
+	keyword2 = utils.TruncateActivityNameString(content)
 
 	userInfo, e := models.GetWxUserItemByUserId(yanxuanSpecialBySpeciaDetail.UserId)
 	if e != nil {
@@ -902,7 +902,7 @@ func SendWxCategoryMsgByYanxuanSpecialMassage(parentId, messageId int, content s
 	var mobile string
 	keyword1 = yanxuanSpecialBySpeciaDetail.Title
 	keyword2 = "作者回复了您的留言"
-	keyword3 = content
+	keyword3 = utils.TruncateActivityNameString(content)
 	keyword4 = time.Now().Format(utils.FormatDateTimeMinute2)
 	if utils.RunMode == "release" {
 		redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_MASSAGE_DETAIL + strconv.Itoa(messageId)

utils/constants.go

@@ -193,12 +193,12 @@ const (
 	WX_MSG_PATH_THIS_WEEK_DETAIL         = "reportPages/reportSecretDetail/reportSecretDetail?type=2&id=" //本周研究汇总详情模板消息地址
 	WX_MSG_PATH_LAST_WEEK_DETAIL         = "reportPages/reportSecretDetail/reportSecretDetail?type=3&id=" //上周纪要汇总详情模板消息地址
 
-	WX_MSG_PATH_YX_COMMENT_DETAIL              = "pages-activity/generationAsk/generationAsk?id="              //研选报告留言详情
-	WX_MSG_PATH_YX_ACTIVITY_DETAIL             = "pages-activity/activityDetail/activityDetail?IsSendWx=1&id=" //研选活动详情
-	WX_MSG_PATH_YX_SIGNUP_DETAIL               = "pages-message/activityTemplate/activityTemplate?id="         //研选报名详情
-	WX_MSG_PATH_YX_ARTICLE_DETAIL              = "pages-user/reportDetail/reportDetail?id="                    //研选纪要详情
-	WX_MSG_PATH_YX_SPECIAL_MASSAGE_DETAIL      = "pages-purchaser/replyDetailsPage/replyDetailsPage?msgId="    //研选专栏留言详情
-	WX_MSG_PATH_YX_SPECIAL_MASSAGE_MANAGE_LIST = "pages-purchaser/commentManagement/commentManagement"         //研选专栏留言管理列表
+	WX_MSG_PATH_YX_COMMENT_DETAIL              = "pages-activity/generationAsk/generationAsk?id="                   //研选报告留言详情
+	WX_MSG_PATH_YX_ACTIVITY_DETAIL             = "pages-activity/activityDetail/activityDetail?IsSendWx=1&id="      //研选活动详情
+	WX_MSG_PATH_YX_SIGNUP_DETAIL               = "pages-message/activityTemplate/activityTemplate?id="              //研选报名详情
+	WX_MSG_PATH_YX_ARTICLE_DETAIL              = "pages-user/reportDetail/reportDetail?id="                         //研选纪要详情
+	WX_MSG_PATH_YX_SPECIAL_MASSAGE_DETAIL      = "pages-purchaser/replyDetailsPage/replyDetailsPage?msgId="         //研选专栏留言详情
+	WX_MSG_PATH_YX_SPECIAL_MASSAGE_MANAGE_LIST = "pages-purchaser/commentManagement/commentManagement?wxMessageId=" //研选专栏留言管理列表
 )
 
 // 微信模板消息推送公共接口的秘钥