Merge branch 'cygx/cygx_need_930' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company.go

@@ -2853,6 +2853,13 @@ func (this *CompanyController) Add() {
 			return
 		}
 	}
+
+	// 每个权益销售手中的试用客户最多30个
+	if productId == utils.COMPANY_PRODUCT_RAI_ID && tryOutCount >= utils.COMPANY_STATUS_TRY_OUT_COUNT_RAI {
+		br.Msg = "您的试用客户总数，已超过上限，不可继续新增"
+		return
+	}
+
 	if seller == nil {
 		br.Msg = "所属销售不存在"
 		return

controllers/company_user.go

@@ -913,21 +913,23 @@ func (this *CompanyUserController) List() {
 		pars = append(pars, productId)
 
 		//流失客户（除非是超级管理员或者是部门管理员，要不然不允许看对应的联系人）
-		var companyProduct *company.CompanyProduct
+		//var companyProduct *company.CompanyProduct
 		//当前是ficc权限，且非ficc管理员
 		//if productId == 1 && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_FICC_ADMIN {
 		//	tmpCompanyProduct, _ := company.GetCompanyProductByCompanyIdAndProductId(companyId, 1)
 		//	companyProduct = tmpCompanyProduct
 		//}
-		if productId == 2 && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN {
-			// 当前是权益权限，且非 权益管理员
-			tmpCompanyProduct, _ := company.GetCompanyProductByCompanyIdAndProductId(companyId, 2)
-			companyProduct = tmpCompanyProduct
-			if companyProduct != nil && companyProduct.Status == utils.COMPANY_STATUS_LOSE {
-				condition += ` AND seller_id=? `
-				pars = append(pars, sysUser.AdminId)
-			}
-		}
+
+		//权益销售查看流失客户时，可以看到非本人名下流失客户的联系人需求池 930 2024-03-25
+		//if productId == 2 && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN {
+		//	// 当前是权益权限，且非 权益管理员
+		//	tmpCompanyProduct, _ := company.GetCompanyProductByCompanyIdAndProductId(companyId, 2)
+		//	companyProduct = tmpCompanyProduct
+		//	if companyProduct != nil && companyProduct.Status == utils.COMPANY_STATUS_LOSE {
+		//		condition += ` AND seller_id=? `
+		//		pars = append(pars, sysUser.AdminId)
+		//	}
+		//}
 	}
 
 	total, err := company.GetCompanyUserListCountV2(condition, pars, companyId)

utils/constants.go

@@ -92,17 +92,18 @@ const (
 
 // 客户状态
 const (
-	COMPANY_STATUS_TRY_OUT         = "试用"
-	COMPANY_STATUS_X_CLASS_TRY_OUT = "X类试用" //最早定义为永续
-	COMPANY_STATUS_FOREVER         = "永续"
-	COMPANY_STATUS_FREEZE          = "冻结"
-	COMPANY_STATUS_LOSE            = "流失"
-	COMPANY_STATUS_LOSE_FLAG       = "loss"
-	COMPANY_STATUS_FORMAL          = "正式"
-	COMPANY_STATUS_POTENTIAL       = "潜在"
-	COMPANY_STATUS_CLOSE           = "关闭"
-	COMPANY_STATUS_CLOSE_FLAG      = "close"
-	COMPANY_STATUS_TRY_OUT_COUNT   = 60
+	COMPANY_STATUS_TRY_OUT           = "试用"
+	COMPANY_STATUS_X_CLASS_TRY_OUT   = "X类试用" //最早定义为永续
+	COMPANY_STATUS_FOREVER           = "永续"
+	COMPANY_STATUS_FREEZE            = "冻结"
+	COMPANY_STATUS_LOSE              = "流失"
+	COMPANY_STATUS_LOSE_FLAG         = "loss"
+	COMPANY_STATUS_FORMAL            = "正式"
+	COMPANY_STATUS_POTENTIAL         = "潜在"
+	COMPANY_STATUS_CLOSE             = "关闭"
+	COMPANY_STATUS_CLOSE_FLAG        = "close"
+	COMPANY_STATUS_TRY_OUT_COUNT     = 60
+	COMPANY_STATUS_TRY_OUT_COUNT_RAI = 30 // 权益试用客户上限
 
 	COMPANY_APPROVE_STATUS = "待审批"
 )