Merge branch 'cygx_13.6' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/chart_permission.go

@@ -64,9 +64,10 @@ func (this *ChartPermissionController) ListByReport() {
 		this.ServeJSON()
 	}()
 	var condition string
-	var chartPermissionId string
-	chartPermissionId = strconv.Itoa(utils.YI_YAO_ID) + "," + strconv.Itoa(utils.XIAO_FEI_ID) + "," + strconv.Itoa(utils.KE_JI_ID) + "," + strconv.Itoa(utils.ZHI_ZAO_ID) + "," + strconv.Itoa(utils.CE_LUE_ID) + "," + strconv.Itoa(utils.GU_SHOU_ID_CHART)
-	condition += ` AND  chart_permission_id IN ( ` + chartPermissionId + `)`
+	//var chartPermissionId string
+	//chartPermissionId = strconv.Itoa(utils.YI_YAO_ID) + "," + strconv.Itoa(utils.XIAO_FEI_ID) + "," + strconv.Itoa(utils.KE_JI_ID) + "," + strconv.Itoa(utils.ZHI_ZAO_ID) + "," + strconv.Itoa(utils.CE_LUE_ID) + "," + strconv.Itoa(utils.GU_SHOU_ID_CHART)
+	//condition += ` AND  chart_permission_id IN ( ` + chartPermissionId + `)`
+	condition += ` AND permission_name IN ('医药','消费','科技','智造','策略','固收','周期') `
 	list, err := models.GetChartPermissionReportAll(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -153,7 +154,7 @@ func (this *MobileChartPermissionAuthController) Noyx() {
 		return
 	}
 	var condition string
-	condition += ` AND permission_name IN ('医药','消费','科技','智造','策略','固收') `
+	condition += ` AND permission_name IN ('医药','消费','科技','智造','策略','固收','周期') `
 	list, err := models.GetChartPermissionReportAll(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"

controllers/tag.go

@@ -74,7 +74,7 @@ func (this *TagController) TagCustomizeList() {
 		}
 	}
 	//var condition string
-	condition = ` AND permission_name IN ('医药','消费','科技','智造','策略','固收') `
+	condition = ` AND permission_name IN ('医药','消费','科技','智造','策略','固收','周期') `
 	listPermission, err := models.GetChartPermissionReportAll(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"

controllers/user.go

@@ -644,6 +644,10 @@ func (this *UserController) ApplyTryOut() {
 		openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
 		if openIpItem != nil && openIpItem.OpenId != "" {
 			go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
+			//if isResearch {
+			//	//如果是研选的报告走研选的类目模版消息
+			//	go services.SendPermissionApplyCategoryTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
+			//}
 		}
 	}
 

services/wechat_send_category_template_msg.go

@@ -267,3 +267,50 @@ func SendReviewCategoryTemplateMsgAdmin(specialId int) (err error) {
 	}
 	return
 }
+
+// 试用申请模板消息
+func SendPermissionApplyCategoryTemplateMsg(realName, companyName, mobile, applyMethod string, itemOpenid *models.OpenIdList) (err error) {
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg(fmt.Sprint("权限申请模板消息推送消息失败,SendPermissionApplyCategoryTemplateMsg 手机号", mobile, "公司：", companyName, "手机号：", mobile, ";Err:"+err.Error()), 2)
+		}
+	}()
+	var keyword1 string
+	var keyword2 string
+	var keyword3 string
+	var keyword4 string
+	var keyword5 string
+	var redirectUrl string
+
+	//detail, e := models.GetCygxApplyRecordByMobile(mobile)
+	//if e != nil {
+	//	err = errors.New("GetActivitySignupNomeetingCountList" + e.Error())
+	//	return
+	//}
+	////如果是潜在客户就推送可查看详情的模版消息
+	//if utils.RunMode == "release" {
+	//	if detail.ApplyMethod == 2 {
+	//		redirectUrl = utils.WX_MSG_PATH_APPLY_DETAIL + strconv.Itoa(detail.ApplyRecordId)
+	//	}
+	//}
+
+	openIdArr := make([]string, 0)
+	openIdArr = append(openIdArr, itemOpenid.OpenId)
+	sendInfo := new(SendWxCategoryTemplate)
+
+	keyword1 = realName
+	keyword2 = companyName
+	keyword3 = "权限申请"
+	keyword4 = time.Now().Format(utils.FormatDateTimeMinute2)
+	keyword5 = applyMethod
+
+	sendInfo.Keywords = []string{keyword1, keyword2, keyword3, keyword4, keyword5}
+	sendInfo.TemplateId = utils.WxCategoryMsgTemplateIdApplyXzs
+	sendInfo.RedirectUrl = redirectUrl
+	sendInfo.RedirectTarget = 4
+	sendInfo.Resource = mobile
+	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_APPLY
+	sendInfo.OpenIdArr = openIdArr
+	err = SendCategoryTemplateMsg(sendInfo)
+	return
+}