|
@@ -434,7 +434,7 @@ func SendActivityAskApplyTemplateMsg(applyName, applyTime, askContent, activityN
|
|
|
}
|
|
|
|
|
|
// 活动带问提醒
|
|
|
-func SendActivityAskApplyTemplateMsgV2(keyword1, keyword2, keyword3, keyword4, remark string, itemOpenid *models.OpenIdList, itemAct *models.ActivityDetail) (err error) {
|
|
|
+func SendActivityAskApplyTemplateMsgV2(keyword1, keyword2, keyword3, keyword4, remark string, itemOpenid *models.OpenIdList, itemAct *models.ActivityDetail, msgId int) (err error) {
|
|
|
var msg string
|
|
|
defer func() {
|
|
|
if err != nil {
|
|
@@ -461,7 +461,14 @@ func SendActivityAskApplyTemplateMsgV2(keyword1, keyword2, keyword3, keyword4, r
|
|
|
sendInfo.RedirectUrl = redirectUrl
|
|
|
sendInfo.RedirectTarget = 3
|
|
|
sendInfo.Resource = strconv.Itoa(activityId)
|
|
|
- sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ACTIVITY_ADD
|
|
|
+
|
|
|
+ //mapSource留言跳转类型,1:文章、2:活动、3:微路演视频、4:活动视频、5:活动音频
|
|
|
+ if utils.RunMode != "release" {
|
|
|
+ sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ACTIVITY_ADD
|
|
|
+ } else {
|
|
|
+ redirectUrl = utils.WX_MSG_PATH_TEMPLATE_MSG + "SourceId=" + strconv.Itoa(msgId) + "&SourceType=2"
|
|
|
+ }
|
|
|
+
|
|
|
sendInfo.OpenIdArr = openIdArr
|
|
|
err = PublicSendTemplateMsg(sendInfo)
|
|
|
return
|
|
@@ -682,7 +689,7 @@ func SendActivityOnenIdWxTemplateMsg(first, keyWord1, keyWord2, keyWord3, keyWor
|
|
|
|
|
|
// 发送用户留言提醒
|
|
|
// func SendCommentWxTemplateMsg(title, companyName, userName, sellerName, createTime, content string, openIdList []*models.OpenIdList, articleId int) (err error) {
|
|
|
-func SendCommentWxTemplateMsg(req models.AddCygxArticleCommentReq, user *models.WxUserItem, articleInfo *models.ArticleDetail) (err error) {
|
|
|
+func SendCommentWxTemplateMsg(req models.AddCygxArticleCommentReq, user *models.WxUserItem, articleInfo *models.ArticleDetail, msgId int) (err error) {
|
|
|
var msg string
|
|
|
defer func() {
|
|
|
if err != nil {
|
|
@@ -729,7 +736,13 @@ func SendCommentWxTemplateMsg(req models.AddCygxArticleCommentReq, user *models.
|
|
|
for _, v := range openIdList {
|
|
|
openIdArr = append(openIdArr, v.OpenId)
|
|
|
}
|
|
|
- redirectUrl = utils.WX_MSG_PATH_ARTICLE_DETAIL + strconv.Itoa(articleInfo.ArticleId)
|
|
|
+ //mapSource留言跳转类型,1:文章、2:活动、3:微路演视频、4:活动视频、5:活动音频
|
|
|
+ if utils.RunMode != "release" {
|
|
|
+ redirectUrl = utils.WX_MSG_PATH_ARTICLE_DETAIL + strconv.Itoa(articleInfo.ArticleId)
|
|
|
+ } else {
|
|
|
+ redirectUrl = utils.WX_MSG_PATH_TEMPLATE_MSG + "SourceId=" + strconv.Itoa(msgId) + "&SourceType=1"
|
|
|
+ }
|
|
|
+
|
|
|
sendInfo := new(SendWxTemplate)
|
|
|
sendInfo.First = first
|
|
|
sendInfo.Keyword1 = keyword1
|
|
@@ -751,7 +764,7 @@ func SendCommentWxTemplateMsg(req models.AddCygxArticleCommentReq, user *models.
|
|
|
}
|
|
|
|
|
|
// 微路演新增留言提问消息提醒
|
|
|
-func SendWxMsgWithMicroRoadshowAsk(req models.AddVideoCommnetReq, user *models.WxUserItem, resourceId int) (err error) {
|
|
|
+func SendWxMsgWithMicroRoadshowAsk(req models.AddVideoCommnetReq, user *models.WxUserItem, resourceId, msgId int) (err error) {
|
|
|
var msg string
|
|
|
defer func() {
|
|
|
if err != nil || msg != "" {
|
|
@@ -790,15 +803,29 @@ func SendWxMsgWithMicroRoadshowAsk(req models.AddVideoCommnetReq, user *models.W
|
|
|
for _, v := range openIdList {
|
|
|
openIdArr = append(openIdArr, v.OpenId)
|
|
|
}
|
|
|
+ mapSource := make(map[int]string)
|
|
|
+ mapSource[1] = "5"
|
|
|
+ mapSource[2] = "4"
|
|
|
+ mapSource[3] = "3"
|
|
|
+
|
|
|
+ if mapSource[resourceId] == "" {
|
|
|
+ err = errors.New("留言消息类型错误, resourceId: " + strconv.Itoa(resourceId))
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
//SourceType int `description:"视频来源: 1-音频; 2-活动视频; 3-微路演视频 (不传默认为1)"`
|
|
|
+ //mapSource留言跳转类型,1:文章、2:活动、3:微路演视频、4:活动视频、5:活动音频
|
|
|
redirectUrl := ""
|
|
|
- if req.SourceType == 3 {
|
|
|
- redirectUrl = utils.WX_MSG_PATH_ACTIVITY_INDUSTRYR_EPORT + strconv.Itoa(resourceId)
|
|
|
- remark = "点击进入产业资源包详情页"
|
|
|
+ if utils.RunMode != "release" {
|
|
|
+ if req.SourceType == 3 {
|
|
|
+ redirectUrl = utils.WX_MSG_PATH_ACTIVITY_INDUSTRYR_EPORT + strconv.Itoa(resourceId)
|
|
|
+ remark = "点击进入产业资源包详情页"
|
|
|
+ } else {
|
|
|
+ redirectUrl = utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(resourceId)
|
|
|
+ remark = "点击查看活动详情"
|
|
|
+ }
|
|
|
} else {
|
|
|
- redirectUrl = utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(resourceId)
|
|
|
- remark = "点击查看活动详情"
|
|
|
+ redirectUrl = utils.WX_MSG_PATH_TEMPLATE_MSG + "SourceId=" + strconv.Itoa(msgId) + "&SourceType=" + mapSource[resourceId]
|
|
|
}
|
|
|
sendInfo := new(SendWxTemplate)
|
|
|
sendInfo.First = first
|