Merge branch 'cygx/cygx_14-5' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_apply.go

@@ -2040,8 +2040,20 @@ func (this *CompanyApplyController) ApplyContract() {
 			//}
 
 		} else {
+			itemsMenu, err := company.GetPermissionSetMenuItemsByType(utils.COMPANY_PRODUCT_RAI_ID)
+			if err != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
+				return
+			}
+			var setMenuChartPermissionId []int //权益大套餐所对应的行业
+			for _, v := range itemsMenu {
+				setMenuChartPermissionId = append(setMenuChartPermissionId, v.ChartPermissionId)
+			}
 			bigPackage70.PermissionName = utils.CHART_PERMISSION_NAME_70W
+			bigPackage70.SetMenuChartPermissionId = setMenuChartPermissionId
 			bigPackage45.PermissionName = utils.CHART_PERMISSION_NAME_45W
+			bigPackage45.SetMenuChartPermissionId = setMenuChartPermissionId
 			plist.Items = append(plist.Items, bigPackage45, bigPackage70)
 		}
 

controllers/company_apply_v2.go

@@ -123,6 +123,7 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
 
 	mapPermissionIdUpgrade := make(map[int]int, 0)
 	mapPermissionIdExpensive := make(map[int]int, 0)
+	mapPoints := make(map[int]float64)
 	var raicontractType string
 	if productId == 2 {
 		// CRM13.3改-是否为权益内部人员, 非权益内部人员只能勾选行业不能勾选单独的主客观, 勾选行业(即勾选主观的ID需要加入客观的权限ID)
@@ -132,7 +133,9 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
 			br.ErrMsg = "判断是否为权益内部人员失败, GetRaiAdmin Err: " + e.Error()
 			return
 		}
-
+		for _, v := range req.PointsArr {
+			mapPoints[v.ChartPermissionId] = v.Points
+		}
 		var permissionIdsNew string
 		permissionIdsNew, mapPermissionIdUpgrade, mapPermissionIdExpensive, err = services.CheckCompanyUpgradeV2(req.PermissionIds, isRai)
 		if err != nil {
@@ -317,11 +320,6 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
 			br.ErrMsg = "获取权限名称失败,Err:" + err.Error()
 			return
 		}
-
-		mapPoints := make(map[int]float64)
-		for _, v := range req.PointsArr {
-			mapPoints[v.ChartPermissionId] = v.Points
-		}
 		for _, v := range permissionArr {
 			item := new(company.CompanyContractPermission)
 			item.CompanyId = req.CompanyId
@@ -338,7 +336,6 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
 				continue
 			}
 			permissionMap[chartPermissionId] = chartPermissionId
-
 			item.ChartPermissionId = chartPermissionId
 			item.PermissionName = permissionNameMap[chartPermissionId]
 			//如果是研选扣点包的权限，写入扣点点数
@@ -401,7 +398,7 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
 			br.ErrMsg = "获取审批记录失败,Err:" + err.Error()
 			return
 		}
-		err = company.ModifyCompanyApplyServiceUpdate(&req, productId, recode.CompanyContractId, companyProduct.IsFormal, mapPermissionIdUpgrade, mapPermissionIdExpensive)
+		err = company.ModifyCompanyApplyServiceUpdate(&req, productId, recode.CompanyContractId, companyProduct.IsFormal, mapPermissionIdUpgrade, mapPermissionIdExpensive, mapPoints)
 		if err != nil {
 			br.Msg = "申请失败"
 			br.ErrMsg = "申请失败,Err:" + err.Error()

models/company/company_approval.go

@@ -1386,7 +1386,7 @@ func ModifyCompanyTurnPositiveBySystemContract(contractDetail *contract.Contract
 }
 
 // ModifyCompanyApplyServiceUpdate 修改申请信息
-func ModifyCompanyApplyServiceUpdate(item *CompanyApplyServiceUpdateReq, productId, companyContractId, isFormal int, mapPermissionIdUpgrade, mapPermissionIdExpensive map[int]int) (err error) {
+func ModifyCompanyApplyServiceUpdate(item *CompanyApplyServiceUpdateReq, productId, companyContractId, isFormal int, mapPermissionIdUpgrade, mapPermissionIdExpensive map[int]int, mapPoints map[int]float64) (err error) {
 	o := orm.NewOrm()
 	to, err := o.Begin()
 	if err != nil {
@@ -1434,6 +1434,7 @@ func ModifyCompanyApplyServiceUpdate(item *CompanyApplyServiceUpdateReq, product
 			return
 		}
 		contractPermission.ChartPermissionId = chartPermissionId
+		contractPermission.Points = mapPoints[chartPermissionId]
 
 		contractPermission.StartDate = item.StartDate
 		contractPermission.EndDate = item.EndDate
@@ -1444,6 +1445,7 @@ func ModifyCompanyApplyServiceUpdate(item *CompanyApplyServiceUpdateReq, product
 		contractPermission.IsUpgrade = mapPermissionIdUpgrade[p]
 		contractPermission.ExpensiveYx = mapPermissionIdExpensive[p]
 		tmpErr = AddCompanyContractPermission(contractPermission)
+
 		if tmpErr != nil {
 			err = tmpErr
 			return

models/company/company_permission.go

@@ -170,27 +170,28 @@ type PermissionLookList struct {
 }
 
 type PermissionLookItem struct {
-	ChartPermissionId  int                   `description:"权限id"`
-	PermissionName     string                `description:"权限名称"`
-	StartDate          string                `description:"权限开始日期"`
-	EndDate            string                `description:"权限结束日期"`
-	Status             string                `description:"'正式','试用','关闭'"`
-	ExpireDay          string                `description:"到期天数"`
-	ClassifyName       string                `description:"分类"`
-	PermissionType     int                   `description:"1主观，2客观"`
-	PermissionTypeName string                `description:"主观、客观"`
-	Checked            bool                  `description:"选中状态"`
-	Remark             string                `description:"备注"`
-	IsMerge            bool                  `description:"是否合并行业, 给前端的标识, 暂时仅权益使用"`
-	RaiBothHas         bool                  `description:"权益-是否主客观都有"`
-	IsUpgrade          int                   `description:"是否升级，1是，0否"`
-	ExpensiveYx        int                   `description:"权益研选: 0-3w; 1-5w ,2: 10W"`
-	Points             float64               `description:"研选扣点包点数"`
-	ParentId           int                   `description:"父级权限id"`
-	IsPublic           int                   `description:"是否是公有权限1:公有权限，0私有权限"`
-	ShowInput          bool                  `description:"是否包含输入框"`
-	ChartContent       string                `description:"权限申请时下面的框点数回显"`
-	Child              []*PermissionLookItem `description:"子权限"`
+	ChartPermissionId        int                   `description:"权限id"`
+	PermissionName           string                `description:"权限名称"`
+	StartDate                string                `description:"权限开始日期"`
+	EndDate                  string                `description:"权限结束日期"`
+	Status                   string                `description:"'正式','试用','关闭'"`
+	ExpireDay                string                `description:"到期天数"`
+	ClassifyName             string                `description:"分类"`
+	PermissionType           int                   `description:"1主观，2客观"`
+	PermissionTypeName       string                `description:"主观、客观"`
+	Checked                  bool                  `description:"选中状态"`
+	Remark                   string                `description:"备注"`
+	IsMerge                  bool                  `description:"是否合并行业, 给前端的标识, 暂时仅权益使用"`
+	RaiBothHas               bool                  `description:"权益-是否主客观都有"`
+	IsUpgrade                int                   `description:"是否升级，1是，0否"`
+	ExpensiveYx              int                   `description:"权益研选: 0-3w; 1-5w ,2: 10W"`
+	Points                   float64               `description:"研选扣点包点数"`
+	ParentId                 int                   `description:"父级权限id"`
+	IsPublic                 int                   `description:"是否是公有权限1:公有权限，0私有权限"`
+	ShowInput                bool                  `description:"是否包含输入框"`
+	ChartContent             string                `description:"权限申请时下面的框点数回显"`
+	SetMenuChartPermissionId []int                 `description:"大套餐所包含的权限id"`
+	Child                    []*PermissionLookItem `description:"子权限"`
 }
 
 // todo 确认是否需要删除