Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into crm/crm_16.0

controllers/company.go

@@ -2866,7 +2866,7 @@ func (this *CompanyController) Add() {
 				return
 			}
 			if tryOutCountRai >= utils.COMPANY_STATUS_TRY_OUT_COUNT_RAI {
-				br.Msg = "非研选试用客户最多30家"
+				br.Msg = "非研选试用客户最多40家"
 				return
 			}
 		}
@@ -3988,7 +3988,7 @@ func (this *CompanyController) Edit() {
 					return
 				}
 				if tryOutCountRai >= utils.COMPANY_STATUS_TRY_OUT_COUNT_RAI {
-					br.Msg = "非研选试用客户最多30家"
+					br.Msg = "非研选试用客户最多40家"
 					return
 				}
 			}
@@ -4989,7 +4989,7 @@ func (this *CompanyController) Receive() {
 				return
 			}
 			if tryOutCountRai >= utils.COMPANY_STATUS_TRY_OUT_COUNT_RAI {
-				br.Msg = "非研选试用客户最多30家"
+				br.Msg = "非研选试用客户最多40家"
 				return
 			}
 		}
@@ -5271,7 +5271,7 @@ func (this *CompanyController) MoveSeller() {
 				return
 			}
 			if tryOutCountRai >= utils.COMPANY_STATUS_TRY_OUT_COUNT_RAI {
-				br.Msg = seller.RealName + "的非研选试用客户已超过30家"
+				br.Msg = seller.RealName + "的非研选试用客户已超过40家"
 				return
 			}
 		}

controllers/company_apply_v2.go

@@ -1482,7 +1482,7 @@ func (this *CompanyApplyController) ApplyThaw() {
 				return
 			}
 			if tryOutCountRai >= utils.COMPANY_STATUS_TRY_OUT_COUNT_RAI {
-				br.Msg = "非研选试用客户最多30家"
+				br.Msg = "非研选试用客户最多40家"
 				return
 			}
 		}
@@ -1984,7 +1984,7 @@ func (this *CompanyApplyController) ApplyReceive() {
 				return
 			}
 			if tryOutCountRai >= utils.COMPANY_STATUS_TRY_OUT_COUNT_RAI {
-				br.Msg = "非研选试用客户最多30家"
+				br.Msg = "非研选试用客户最多40家"
 				return
 			}
 		}

controllers/roadshow/calendar.go

@@ -2438,8 +2438,7 @@ func (this *CalendarController) MyCalendarDetail() {
 	if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_RESEARCHR ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_RESEARCHR ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_RESEARCHR ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER {
+		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
 		condition += ` AND b.researcher_id=?`
 		pars = append(pars, sysUser.AdminId)
 
@@ -2475,6 +2474,60 @@ func (this *CalendarController) MyCalendarDetail() {
 		return
 	}
 
+	if calendarList == nil {
+		calendarList = make([]*roadshow.CalendarListView, 0)
+	} else {
+		var sysUserIds []int             //建会人ID
+		var companyIds []int             //公司ID
+		for _, v := range calendarList { //上海同步过来信息展示逻辑替换 需求池 953
+			if v.Source == 1 && v.CompanyName == "" {
+				v.CompanyName = v.Title
+			}
+			if v.SysUserId > 0 {
+				sysUserIds = append(sysUserIds, v.SysUserId)
+			}
+			if v.CompanyId > 1 {
+				companyIds = append(companyIds, v.CompanyId)
+			}
+		}
+
+		//如果是权益销售建的会，客户状态替换成权益那边的
+		mapSellRai := make(map[int]bool)  // 是否是权益销售
+		mapStatus := make(map[int]string) //权益客户对应的状态
+		if len(sysUserIds) > 0 && len(companyIds) > 0 {
+			//判断哪些人是权益销售
+			adminList, err := system.GetAdminListByIdListWithoutEnable(sysUserIds)
+			if err != nil {
+				br.Msg = "获取数据失败"
+				br.ErrMsg = "获取数据失败，GetAdminListByIdListWithoutEnable Err:" + err.Error()
+				return
+			}
+			for _, v := range adminList {
+				if v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER || v.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP {
+					mapSellRai[v.AdminId] = true
+				}
+			}
+
+			conditionProduct := `  AND company_id  IN (` + utils.GetOrmInReplace(len(companyIds)) + `) AND  product_id = 2 `
+			parsProduct := make([]interface{}, 0)
+			parsProduct = append(parsProduct, companyIds)
+			productList, err := company.GetCompanyProductList(conditionProduct, parsProduct)
+			if err != nil {
+				br.Msg = "获取数据失败"
+				br.ErrMsg = "获取数据失败，GetCompanyProductList Err:" + err.Error()
+				return
+			}
+			for _, v := range productList {
+				mapStatus[v.CompanyId] = v.Status
+			}
+		}
+		for _, v := range calendarList {
+			if mapSellRai[v.SysUserId] && mapStatus[v.CompanyId] != "" {
+				v.CompanyStatus = mapStatus[v.CompanyId]
+			}
+		}
+	}
+
 	matterList, err := roadshow.GetRsMattersList(startDate, endDate, sysUser.AdminId)
 	if err != nil {
 		br.Msg = "获取数据失败"

utils/constants.go

@@ -106,7 +106,7 @@ const (
 	COMPANY_STATUS_CLOSE             = "关闭"
 	COMPANY_STATUS_CLOSE_FLAG        = "close"
 	COMPANY_STATUS_TRY_OUT_COUNT     = 60
-	COMPANY_STATUS_TRY_OUT_COUNT_RAI = 30 // 权益试用客户上限
+	COMPANY_STATUS_TRY_OUT_COUNT_RAI = 40 // 权益试用客户上限
 
 	COMPANY_APPROVE_STATUS = "待审批"
 )