no message

models/roadshow/report.go

@@ -111,7 +111,7 @@ func RsCompanyListRai() (list []*CompanySearchView, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT b.company_id,b.company_name,a.credit_code,b.status FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
-			WHERE b.status IN('正式','试用') AND b.product_id=2 `
+			WHERE  b.product_id=2 `
 	sql += ` GROUP BY b.company_id  `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return

services/roadshow/report.go

@@ -23,8 +23,12 @@ func AddReportRecord(cont context.Context) (err error) {
 		return
 	}
 	adminMap := make(map[int]*models.AdminView)
+	mapRaiSllerId := make(map[int]bool) // 是否为权益销售
 	for _, v := range adminAll {
 		adminMap[v.AdminId] = v
+		if v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER || v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP || v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
+			mapRaiSllerId[v.AdminId] = true
+		}
 	}
 
 	companyList, err := roadshow.RsCompanyList()
@@ -32,20 +36,18 @@ func AddReportRecord(cont context.Context) (err error) {
 		return
 	}
 
-	companyListRai, err := roadshow.RsCompanyListRai() //权益销售
+	companyListRai, err := roadshow.RsCompanyListRai() //权益客户信息
 	if err != nil {
 		return
 	}
 	companyMap := make(map[int]*roadshow.CompanySearchView)
+	companyMapRai := make(map[int]*roadshow.CompanySearchView)
 	for _, v := range companyList {
 		companyMap[v.CompanyId] = v
 	}
 
 	for _, v := range companyListRai {
-		if companyMap[v.CompanyId] != nil {
-			continue
-		}
-		companyMap[v.CompanyId] = v
+		companyMapRai[v.CompanyId] = v
 	}
 
 	endDate := time.Now().AddDate(-1, 0, 0).Format(utils.FormatDate)
@@ -66,7 +68,11 @@ func AddReportRecord(cont context.Context) (err error) {
 	for _, v := range list {
 		company := new(roadshow.CompanySearchView)
 		if v.CompanyId > 0 {
-			company, _ = companyMap[v.CompanyId]
+			if mapRaiSllerId[v.SysUserId] {
+				company, _ = companyMapRai[v.CompanyId] // 如果是权益销售添加的信息，就用权益相关的客户信息
+			} else {
+				company, _ = companyMap[v.CompanyId]
+			}
 		}
 
 		researcher, ok := adminMap[v.ResearcherId]

utils/constants.go

@@ -185,3 +185,41 @@ const (
 const (
 	EnCompanyIdStep = 10000000
 )
+
+// 管理员，ficc管理员，ficc销售，权益管理员，权益销售。
+// 角色类型/类型编码
+const (
+	ROLE_TYPE_ADMIN       = "管理员"
+	ROLE_TYPE_FICC_ADMIN  = "ficc管理员"
+	ROLE_TYPE_FICC_SELLER = "ficc销售"
+	ROLE_TYPE_RAI_ADMIN   = "权益管理员"
+	ROLE_TYPE_RAI_SELLER  = "权益销售"
+	ROLE_TYPE_RAI_PRODUCT = "权益产品"
+
+	ROLE_TYPE_FICC_GROUP      = "ficc销售组长"
+	ROLE_TYPE_FICC_MANAGER    = "ficc销售主管"
+	ROLE_TYPE_RAI_GROUP       = "权益销售组长"
+	ROLE_TYPE_FICC_DEPARTMENT = "ficc部门经理"
+	ROLE_TYPE_RAI_DEPARTMENT  = "权益部门经理"
+	ROLE_TYPE_FICC_RESEARCHR  = "ficc研究员"
+	ROLE_TYPE_RAI_RESEARCHR   = "权益研究员"
+	ROLE_NAME_FICC_DIRECTOR   = "ficc销售经理" // 实际角色类型为ficc销售主管
+
+	ROLE_TYPE_CODE_ADMIN           = "admin"           //管理员
+	ROLE_TYPE_CODE_FICC_ADMIN      = "ficc_admin"      //ficc管理员
+	ROLE_TYPE_CODE_FICC_SELLER     = "ficc_seller"     //ficc销售
+	ROLE_TYPE_CODE_RAI_ADMIN       = "rai_admin"       //权益管理员
+	ROLE_TYPE_CODE_RAI_SELLER      = "rai_seller"      //权益销售
+	ROLE_TYPE_CODE_FICC_GROUP      = "ficc_group"      //ficc销售主管
+	ROLE_TYPE_CODE_RAI_GROUP       = "rai_group"       //ficc组长
+	ROLE_TYPE_CODE_FICC_DEPARTMENT = "ficc_department" //ficc部门经理
+	ROLE_TYPE_CODE_RAI_DEPARTMENT  = "rai_department"  //权益部门经理
+	ROLE_TYPE_CODE_FICC_RESEARCHR  = "ficc_researcher" //ficc研究员
+	ROLE_TYPE_CODE_RESEARCHR       = "researcher"      //ficc研究员（最早定义的）
+	ROLE_TYPE_CODE_RAI_RESEARCHR   = "rai_researcher"  //权益研究员
+	ROLE_TYPE_CODE_COMPLIANCE      = "compliance"      //合规角色
+	ROLE_TYPE_CODE_FINANCE         = "finance"         //财务角色
+	ROLE_TYPE_CODE_FICC_TEAM       = "ficc_team"       //ficc销售组长
+
+	ROLE_TYPE_SELLERS = "'ficc_admin','ficc_seller','ficc_team','rai_admin','rai_seller','ficc_group','rai_group','ficc_department','rai_department','compliance','finance'"
+)