no message

controllers/company_apply.go

@@ -402,8 +402,9 @@ func (this *CompanyApplyController) ApplyContractDetail() {
 		permissions := make([]int, 0) // 合同权限IDs
 		checkItems := make([]*company.PermissionLookItem, 0)
 		//expMap := map[bool]string{false: "(3w)", true: "(5w)"} // 买方研选价格
-		var expensiveYx int
+		//var expensiveYx int
 		// 未选大套餐, 走老逻辑
+		var points float64
 		if detail.RaiPackageType == 0 {
 			mapUpgrade := make(map[int]bool) // 通过合同获取所勾选的升级行业权限
 
@@ -413,11 +414,18 @@ func (this *CompanyApplyController) ApplyContractDetail() {
 				}
 				if v.ExpensiveYx > 0 {
 					mapExpensive[v.ChartPermissionId] = true
-					expensiveYx = v.ExpensiveYx
+					//expensiveYx = v.ExpensiveYx
+				}
+
+				if v.Points > 0 && v.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+					points = v.Points
 				}
 				permissions = append(permissions, v.ChartPermissionId)
 			}
 			for _, n := range items {
+				if points > 0 && n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+					n.PermissionName += fmt.Sprint("(", points, "点)")
+				}
 				if utils.InArrayByInt(permissions, n.ChartPermissionId) {
 					checkList = append(checkList, n.ChartPermissionId)
 					checkItems = append(checkItems, n)
@@ -449,14 +457,14 @@ func (this *CompanyApplyController) ApplyContractDetail() {
 						continue
 					}
 					// 买方研选
-					if p.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
-						if expensiveYx == 1 {
-							p.PermissionName += "(5w)"
-						} else if expensiveYx == 2 {
-							p.PermissionName += "(10w)"
-						}
-						//p.PermissionName += expMap[mapExpensive[p.ChartPermissionId]]
-					}
+					//if p.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+					//	if expensiveYx == 1 {
+					//		p.PermissionName += "(5w)"
+					//	} else if expensiveYx == 2 {
+					//		p.PermissionName += "(10w)"
+					//	}
+					//	//p.PermissionName += expMap[mapExpensive[p.ChartPermissionId]]
+					//}
 				}
 			}
 
@@ -483,20 +491,27 @@ func (this *CompanyApplyController) ApplyContractDetail() {
 				if v.ExpensiveYx == 1 {
 					mapExpensive[v.ChartPermissionId] = true
 				}
+				if v.Points > 0 && v.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+					points = v.Points
+				}
 				permissions = append(permissions, v.ChartPermissionId)
 			}
-			// 专家和研选
+			// 专家、研选订阅、研选扣点包
 			for _, n := range items {
-				if n.ChartPermissionId != utils.ZHUAN_JIA_ID && n.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN {
+				if n.ChartPermissionId != utils.ZHUAN_JIA_ID && n.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN && n.ChartPermissionId != utils.YAN_XUAN_KOU_DIAN_BAO_ID {
 					continue
 				}
-				if n.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
-					//n.PermissionName += expMap[mapExpensive[n.ChartPermissionId]]
-					if expensiveYx == 1 {
-						n.PermissionName += "(5w)"
-					} else if expensiveYx == 2 {
-						n.PermissionName += "(10w)"
-					}
+				//if n.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+				//	//n.PermissionName += expMap[mapExpensive[n.ChartPermissionId]]
+				//	if expensiveYx == 1 {
+				//		n.PermissionName += "(5w)"
+				//	} else if expensiveYx == 2 {
+				//		n.PermissionName += "(10w)"
+				//	}
+				//}
+
+				if n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+					n.PermissionName += fmt.Sprint("(", points, "点)")
 				}
 				if utils.InArrayByInt(permissions, n.ChartPermissionId) {
 					checkList = append(checkList, n.ChartPermissionId)

controllers/company_apply_v2.go

@@ -722,6 +722,15 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 			if chartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
 				item.ExpensiveYx = expensiveYx
 			}
+			//如果是研选扣点包，这个行业权限的ID；那么就对点数进行赋值。目前就研选扣点包 这一个行业有点数，先不用数组类型处理。v:查研观向13.2
+			if chartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+				if req.Points <= 0 {
+					br.Msg = "点数不能为空"
+					return
+				}
+				item.Points = req.Points
+			}
+
 			item.StartDate = req.StartDate
 			item.EndDate = req.EndDate
 			item.ModifyTime = time.Now()

controllers/company_permission.go

@@ -154,21 +154,21 @@ func (this *CompanyPermissionController) List() {
 				}
 
 				// 买方研选划分为3w和5w，10W三种
-				if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
-					m3, m5, m10 := new(company.PermissionSetItem), new(company.PermissionSetItem), new(company.PermissionSetItem)
-					m3.ChartPermissionId = v.ChartPermissionId
-					m3.PermissionName = fmt.Sprint(v.PermissionName, "(3w)")
-					p.Items = append(p.Items, m3)
-
-					m5.ChartPermissionId = v.ChartPermissionId + utils.PERMISSION_ID_YANXUAN_DIFF
-					m5.PermissionName = fmt.Sprint(v.PermissionName, "(5w)")
-					p.Items = append(p.Items, m5)
-
-					m10.ChartPermissionId = utils.PERMISSION_ID_YANXUAN_10W_DIFF
-					m10.PermissionName = fmt.Sprint(v.PermissionName, "(10w)")
-					p.Items = append(p.Items, m10)
-					continue
-				}
+				//if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+				//	m3, m5, m10 := new(company.PermissionSetItem), new(company.PermissionSetItem), new(company.PermissionSetItem)
+				//	m3.ChartPermissionId = v.ChartPermissionId
+				//	m3.PermissionName = fmt.Sprint(v.PermissionName, "(3w)")
+				//	p.Items = append(p.Items, m3)
+				//
+				//	m5.ChartPermissionId = v.ChartPermissionId + utils.PERMISSION_ID_YANXUAN_DIFF
+				//	m5.PermissionName = fmt.Sprint(v.PermissionName, "(5w)")
+				//	p.Items = append(p.Items, m5)
+				//
+				//	m10.ChartPermissionId = utils.PERMISSION_ID_YANXUAN_10W_DIFF
+				//	m10.PermissionName = fmt.Sprint(v.PermissionName, "(10w)")
+				//	p.Items = append(p.Items, m10)
+				//	continue
+				//}
 
 				p.Items = append(p.Items, v)
 			}

models/company/company_apply.go

@@ -267,6 +267,7 @@ type CompanyApplyTurnPositiveReq struct {
 	ImgUrl            string  `description:"合同图片，多个用英文#隔开"`
 	PackageType       int     `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
 	RaiPackageType    int     `description:"权益套餐类型: 0-无; 1-70w大套餐; 2-45w大套餐"`
+	Points            float64 `description:"研选扣点包点数"`
 }
 
 // 申请转正请求参数

models/company/company_contract.go

@@ -68,6 +68,7 @@ type CompanyContractPermission struct {
 	ModifyTime        time.Time `description:"修改时间"`
 	ContractType      string    `description:"签约合同时，当前行业类型：枚举值：'行业新签','行业续约'"`
 	PermissionName    string    `description:"权限名称"`
+	Points            float64   `description:"研选扣点包点数"`
 }
 
 // 新增客户合同

models/company/company_permission.go

@@ -163,6 +163,7 @@ type PermissionLookItem struct {
 	RaiBothHas         bool                  `description:"权益-是否主客观都有"`
 	IsUpgrade          int                   `description:"是否升级，1是，0否"`
 	ExpensiveYx        int                   `description:"权益研选: 0-3w; 1-5w ,2: 10W"`
+	Points             float64               `description:"研选扣点包点数"`
 	Child              []*PermissionLookItem `description:"子权限"`
 }
 

utils/constants.go

@@ -373,10 +373,11 @@ func GetFiccAdminDepartmentIds() (idStr string) {
 }
 
 const (
-	CHART_PERMISSION_NAME_MF_YANXUAN        string = "买方研选"
+	CHART_PERMISSION_NAME_MF_YANXUAN        string = "研选订阅"
 	LU_YAN_FU_WU                            string = "路演服务"
 	CHART_PERMISSION_NAME_YANXUAN           string = "研选"
-	CHART_PERMISSION_ID_YANXUAN             int    = 31
+	CHART_PERMISSION_ID_YANXUAN             int    = 31 //权限研选订阅id
+	YAN_XUAN_KOU_DIAN_BAO_ID                int    = 52 //研选扣点包ID
 	CE_LUE_NAME                             string = "策略"
 	CE_LUE_ID                               int    = 23
 	YI_YAO_NAME                             string = "医药"