no message

controllers/user.go

@@ -940,6 +940,7 @@ func (this *UserController) ApplyTryOut() {
 	sourceId = detailId
 	source = tryType
 	redirectUrl := ""
+	redirectUrlYx := ""
 	var isResearch bool // 是否属于研选
 	if tryType == "Article" {
 		detail, err := models.GetArticleDetailById(detailId)
@@ -952,7 +953,8 @@ func (this *UserController) ApplyTryOut() {
 		if detail.ArticleTypeId > 0 {
 			isResearch = true
 		}
-		redirectUrl = utils.WX_MSG_PATH_YX_ARTICLE_DETAIL + strconv.Itoa(detailId)
+		redirectUrl = utils.WX_MSG_PATH_ARTICLE_DETAIL + strconv.Itoa(detailId)
+		redirectUrlYx = utils.WX_MSG_PATH_YX_ARTICLE_DETAIL + strconv.Itoa(detailId)
 	} else if tryType == "Activity" {
 		detail, err := models.GetAddActivityInfoById(detailId)
 		if err != nil {
@@ -964,7 +966,8 @@ 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)
+		redirectUrl = utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(detailId)
+		redirectUrlYx = utils.WX_MSG_PATH_YX_ACTIVITY_DETAIL + strconv.Itoa(detailId)
 	} else if tryType == "MicroAudio" {
 		// 微路演音频
 		microAudio, e := models.GetCygxActivityVoiceById(detailId)
@@ -1196,7 +1199,7 @@ func (this *UserController) ApplyTryOut() {
 						applyMethod = companyItem.Status + "客户"
 					}
 				}
-				applyMethod = applyMethod + "," + title
+				//applyMethod = applyMethod + "," + title
 			}
 			openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
 			if openIpItem != nil && openIpItem.OpenId != "" {
@@ -1224,9 +1227,9 @@ func (this *UserController) ApplyTryOut() {
 			applyMethod = "潜在客户"
 			categoryApplyMethod = "潜在客户"
 		}
-		if detailId > 0 {
-			applyMethod = applyMethod + "," + title
-		}
+		//if detailId > 0 {
+		//	applyMethod = applyMethod + "," + title
+		//}
 	}
 	if categoryApplyMethod == "" {
 		categoryApplyMethod = applyMethod
@@ -1256,13 +1259,15 @@ func (this *UserController) ApplyTryOut() {
 		br.ErrMsg = "申请失败，Err:" + err.Error()
 		return
 	}
-	go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, redirectUrl, user) //权限申请模板消息推送
+
 	if isResearch {
 		//如果是研选的报告走研选的类目模版消息
-		go services.SendPermissionApplyTemplateMsgAdminByYxCategory(req, user.CompanyId, mobile, redirectUrl)
+		go services.SendPermissionApplyTemplateMsgAdminByYxCategory(req, user.CompanyId, mobile, applyMethod, redirectUrlYx)
 	}
-	//成功后，设置5分钟缓存，不允许重复添加
-	//utils.Rc.SetNX(cacheKey, user.Mobile, time.Second*60)
+	if detailId > 0 {
+		applyMethod = applyMethod + "," + title
+	}
+	go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, redirectUrl, user) //权限申请模板消息推送
 
 	br.Msg = "申请成功！"
 	br.Ret = 200

services/wx_category_template_msg.go

@@ -833,7 +833,7 @@ func SendWxCategoryMsgWithActivityAsk(companyName, realName, sellerName, askTime
 }
 
 // 研选类目模板消息
-func SendPermissionApplyTemplateMsgAdminByYxCategory(req models.ApplyTryReq, companyId int, usermobile, redirectUrl string) (err error) {
+func SendPermissionApplyTemplateMsgAdminByYxCategory(req models.ApplyTryReq, companyId int, usermobile, applyMethod, redirectUrl string) (err error) {
 	defer func() {
 		if err != nil {
 			go utils.SendAlarmMsg("研选类目模板消息消息失败, SendPermissionApplyTemplateMsgAdminByYxCategoryErrMsg: "+err.Error(), 3)
@@ -876,11 +876,7 @@ func SendPermissionApplyTemplateMsgAdminByYxCategory(req models.ApplyTryReq, com
 	keyword2 = utils.TruncateActivityNameString(req.CompanyName)
 	keyword3 = "权限申请"
 	keyword4 = time.Now().Format(utils.FormatDateTimeMinute2)
-	if companyId == 1 {
-		keyword5 = "潜在客户"
-	} else {
-		keyword5 = "FICC客户"
-	}
+	keyword5 = applyMethod
 	openIdArr := make([]string, 0)
 	for _, v := range openIdList {
 		openIdArr = append(openIdArr, v.OpenId)