no message

controllers/company_apply.go

@@ -468,9 +468,9 @@ func (this *CompanyApplyController) ApplyContractDetail() {
 		//expMap := map[bool]string{false: "(3w)", true: "(5w)"} // 买方研选价格
 		//var expensiveYx int
 		// 未选大套餐, 走老逻辑
-		var points float64
+		//var points float64
+		mapPoints := make(map[int]float64) // 通过合同获取所勾选的升级行业权限
 		if detail.RaiPackageType == 0 {
-
 			totalForever, err := company.GetCompanyProductRaiForeverCount(companyId) //判断是否是权益的永续客户
 			if err != nil {
 				br.Msg = "获取失败"
@@ -496,15 +496,14 @@ func (this *CompanyApplyController) ApplyContractDetail() {
 					mapExpensive[v.ChartPermissionId] = true
 					//expensiveYx = v.ExpensiveYx
 				}
+				mapPoints[v.ChartPermissionId] = v.Points
+				//points = v.Points
 
-				if 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.YAN_XUAN_KOU_DIAN_BAO_ID {
-					n.PermissionName += fmt.Sprint("（", points, "点）")
+				if mapPoints[n.ChartPermissionId] > 0 {
+					n.PermissionName += fmt.Sprint("（", mapPoints[n.ChartPermissionId], "点）")
 				}
 				if utils.InArrayByInt(permissions, n.ChartPermissionId) {
 					checkList = append(checkList, n.ChartPermissionId)
@@ -553,6 +552,16 @@ func (this *CompanyApplyController) ApplyContractDetail() {
 
 		// 如果选择的是大套餐, 那么不再展示每个具体的权限, 除大套餐外还需遍历一下专家和研选3w/5w是否有选(这两个与大套餐不互斥, 可额外选择)
 		if detail.RaiPackageType > 0 {
+			itemsMenu, err := company.GetPermissionSetMenuItemsByType(utils.COMPANY_PRODUCT_RAI_ID)
+			if err != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+				return
+			}
+			setMenuChartPermissionIdMap := make(map[int]bool) //权益大套餐所对应的行业
+			for _, m := range itemsMenu {
+				setMenuChartPermissionIdMap[m.ChartPermissionId] = true
+			}
 			// 大套餐
 			bigPackage := new(company.PermissionLookItem)
 			if detail.RaiPackageType == 1 {
@@ -571,14 +580,13 @@ func (this *CompanyApplyController) ApplyContractDetail() {
 				if v.ExpensiveYx == 1 {
 					mapExpensive[v.ChartPermissionId] = true
 				}
-				if v.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
-					points = v.Points
-				}
+				mapPoints[v.ChartPermissionId] = 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 && n.ChartPermissionId != utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+				//if n.ChartPermissionId != utils.ZHUAN_JIA_ID && n.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN && n.ChartPermissionId != utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+				if setMenuChartPermissionIdMap[n.ChartPermissionId] {
 					continue
 				}
 				//if n.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
@@ -590,8 +598,8 @@ func (this *CompanyApplyController) ApplyContractDetail() {
 				//	}
 				//}
 
-				if n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
-					n.PermissionName += fmt.Sprint("（", points, "点）")
+				if mapPoints[n.ChartPermissionId] > 0 {
+					n.PermissionName += fmt.Sprint("（", mapPoints[n.ChartPermissionId], "点）")
 				}
 				if utils.InArrayByInt(permissions, n.ChartPermissionId) {
 					checkList = append(checkList, n.ChartPermissionId)