Merge branch 'mfyx_wx_tmp_1.1' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/user.go

@@ -308,6 +308,7 @@ func (this *UserController) ApplyTryOut() {
 	detailId := req.DetailId
 	sourceId = detailId
 	source = tryType
+	redirectUrl := ""
 	var isResearch bool // 是否属于研选
 	if tryType == "Article" {
 		detail, err := models.GetArticleDetailById(detailId)
@@ -320,6 +321,7 @@ func (this *UserController) ApplyTryOut() {
 		if detail.ArticleTypeId > 0 {
 			isResearch = true
 		}
+		redirectUrl = utils.WX_MSG_PATH_YX_ARTICLE_DETAIL + strconv.Itoa(detailId)
 	} else if tryType == "Activity" {
 		detail, err := models.GetAddActivityInfoById(detailId)
 		if err != nil {
@@ -331,6 +333,7 @@ func (this *UserController) ApplyTryOut() {
 		if strings.Contains(detail.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 			isResearch = true
 		}
+		redirectUrl = utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(detailId)
 	} else if tryType == "MicroAudio" {
 		// 微路演音频
 		microAudio, e := models.GetCygxActivityVoiceById(detailId)
@@ -596,17 +599,6 @@ func (this *UserController) ApplyTryOut() {
 			applyMethod = applyMethod + "," + title
 		}
 	}
-	//openIpItem, _ := models.GetUserRecordByMobile(4, cnf.ConfigValue)
-	//if openIpItem != nil && openIpItem.OpenId != "" {
-	//	if req.ApplyMethod != 2 {
-	//		req.RealName = user.RealName
-	//		req.CompanyName = user.CompanyName
-	//	}
-	//	utils.FileLog.Info("推送消息 %s %s,%s,%s,%s", req.RealName, req.CompanyName, mobile, openIpItem.OpenId, applyMethod)
-	//	go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
-	//}
-
-	//go services.SendPermissionApplyTemplateMsgAdmin(req, mobile, applyMethod, isResearch)
 
 	item := new(models.CygxApplyRecord)
 	item.UserId = user.UserId
@@ -635,18 +627,10 @@ func (this *UserController) ApplyTryOut() {
 		return
 	}
 
-	go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, user) //权限申请模板消息推送
-	//if sellerItem == nil {
-	//	go services.SendPermissionApplyTemplateMsgAdmin(req, mobile, applyMethod, isResearch)
-	//} else {
-	//	openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
-	//	if openIpItem != nil && openIpItem.OpenId != "" {
-	//
-	//	}
-	//}
+	go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, redirectUrl, user) //权限申请模板消息推送
 	if isResearch {
 		//如果是研选的报告走研选的类目模版消息
-		go services.SendPermissionApplyTemplateMsgAdminByYxCategory(req, user.CompanyId, mobile)
+		go services.SendPermissionApplyTemplateMsgAdminByYxCategory(req, user.CompanyId, mobile, redirectUrl)
 	}
 
 	//添加成功后，设置5分钟缓存，不允许重复添加

services/user.go

@@ -714,7 +714,7 @@ func GetUserhasPermission(user *models.WxUserItem) (hasPermission int, err error
 //}
 
 // 研选类目模板消息
-func SendPermissionApplyTemplateMsgAdminByYxCategory(req models.ApplyTryReq, companyId int, usermobile string) (err error) {
+func SendPermissionApplyTemplateMsgAdminByYxCategory(req models.ApplyTryReq, companyId int, usermobile, redirectUrl string) (err error) {
 	defer func() {
 		if err != nil {
 			go utils.SendAlarmMsg("研选类目模板消息消息失败, SendPermissionApplyTemplateMsgAdminByYxCategoryErrMsg: "+err.Error(), 3)
@@ -771,7 +771,7 @@ func SendPermissionApplyTemplateMsgAdminByYxCategory(req models.ApplyTryReq, com
 		err = errors.New("GetCygxApplyRecordByMobile" + e.Error())
 		return
 	}
-	redirectUrl := ""
+	//redirectUrl := ""
 	//如果是潜在客户就推送可查看详情的模版消息
 	if detail.ApplyMethod == 2 {
 		redirectUrl = utils.WX_MSG_PATH_APPLY_DETAIL + strconv.Itoa(detail.ApplyRecordId)

services/wechat_send_msg.go

@@ -104,7 +104,7 @@ func SendInterviewApplyCancelTemplateMsg(realName, companyName, mobile, articleT
 }
 
 // 权限申请
-func SendPermissionApplyTemplateMsg(realName, companyName, mobile, applyMethod string, user *models.WxUserItem) (err error) {
+func SendPermissionApplyTemplateMsg(realName, companyName, mobile, applyMethod, redirectUrl string, user *models.WxUserItem) (err error) {
 	defer func() {
 		if err != nil {
 			go utils.SendAlarmMsg(fmt.Sprint("权限申请模板消息推送消息失败,手机号", mobile, "公司：", companyName, "手机号：", mobile), 2)
@@ -148,7 +148,7 @@ func SendPermissionApplyTemplateMsg(realName, companyName, mobile, applyMethod s
 	var keyword3 string
 	var keyword4 string
 	var remark string
-	var redirectUrl string
+	//var redirectUrl string
 	detail, e := models.GetCygxApplyRecordByMobile(mobile)
 	if e != nil {
 		err = errors.New("GetCygxApplyRecordByMobile" + e.Error())

utils/constants.go

@@ -201,6 +201,7 @@ const (
 const (
 	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_ARTICLE_DETAIL  = "pages-user/reportDetail/reportDetail?IsSendWx=1&id="         //研选纪要详情
 )
 
 // 微信模板消息推送公共接口的秘钥