Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/wx_template_msg.go

@@ -426,6 +426,13 @@ func SendActivityAskApplyTemplateMsgV2(keyword1, keyword2, keyword3, keyword4, r
 	activityId := itemAct.ActivityId
 	var redirectUrl string
 	//redirectUrl = utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(activityId)
+	//mapSource留言跳转类型，1:文章、2:活动、3:微路演视频、4:活动视频、5:活动音频
+	//if utils.RunMode != "release" {
+	//
+	//} else {
+	//
+	//}
+	redirectUrl = utils.WX_MSG_PATH_TEMPLATE_MSG + "SourceId=" + strconv.Itoa(msgId) + "&SourceType=2"
 	openIdArr := make([]string, 0)
 	openIdArr = append(openIdArr, itemOpenid.OpenId)
 	sendInfo := new(SendWxTemplate)
@@ -433,20 +440,13 @@ func SendActivityAskApplyTemplateMsgV2(keyword1, keyword2, keyword3, keyword4, r
 	sendInfo.Keyword2 = keyword2
 	sendInfo.Keyword3 = keyword3
 	sendInfo.Keyword4 = keyword4
+	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ACTIVITY_ADD
 	sendInfo.Remark = remark
 	sendInfo.TemplateId = utils.WxMsgTemplateIdApplyXzs
 	sendInfo.RedirectUrl = redirectUrl
 	sendInfo.RedirectTarget = 3
 	sendInfo.Resource = strconv.Itoa(activityId)
 
-	//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