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

controllers/user.go

@@ -569,7 +569,7 @@ func (this *UserController) ApplyTryOut() {
 						applyMethod = companyItem.Status + "客户"
 					}
 				}
-				applyMethod = applyMethod + "," + title
+				applyMethod = applyMethod
 			}
 			openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
 			if openIpItem != nil && openIpItem.OpenId != "" {
@@ -596,7 +596,8 @@ func (this *UserController) ApplyTryOut() {
 			applyMethod = "潜在客户"
 		}
 		if detailId > 0 {
-			applyMethod = applyMethod + "," + title
+			//applyMethod = applyMethod + "," + title
+			applyMethod = applyMethod
 		}
 	}
 
@@ -630,7 +631,7 @@ func (this *UserController) ApplyTryOut() {
 	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, 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, 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)
@@ -757,11 +757,8 @@ 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)

utils/constants.go

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