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

controllers/company_apply.go

@@ -2113,6 +2113,7 @@ func (this *CompanyApplyController) ApplyContract() {
 			if n.PermissionType == 2 && totalForever > 0 {
 				continue
 			}
+			n.Points = mapPoints[n.ChartPermissionId]
 			if utils.InArrayByInt(permissionIds, n.ChartPermissionId) {
 				n.Checked = true
 				if _, ok := mapUpgrade[n.ChartPermissionId]; ok {
@@ -2169,7 +2170,6 @@ func (this *CompanyApplyController) ApplyContract() {
 					})
 				}
 			}
-			n.Points = mapPoints[n.ChartPermissionId]
 			plist.Items = append(plist.Items, n)
 
 			if totalForever == 0 && !mapPermissionNameUpgrade[n.PermissionName] {

controllers/company_apply_v2.go

@@ -317,6 +317,11 @@ 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
@@ -337,9 +342,7 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
 			item.ChartPermissionId = chartPermissionId
 			item.PermissionName = permissionNameMap[chartPermissionId]
 			//如果是研选扣点包的权限，写入扣点点数
-			if chartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
-				item.Points = req.Points
-			}
+			item.Points = mapPoints[chartPermissionId]
 			item.StartDate = req.StartDate
 			item.EndDate = req.EndDate
 			item.IsUpgrade = mapPermissionIdUpgrade[chartPermissionId]

models/company/company_apply.go

@@ -9,19 +9,25 @@ import (
 
 // 申请服务更新请求参数
 type CompanyApplyServiceUpdateReq struct {
-	CompanyId         int     `description:"客户id"`
-	CompanyApprovalId int     `description:"申请单id，没有传0"`
-	ContractType      string  `description:"合同类型，枚举值：'新签合同','续约合同','补充协议'"`
-	CompanyType       string  `description:"客户类型，ficc/权益"`
-	StartDate         string  `description:"合同开始日期"`
-	EndDate           string  `description:"合同结束日期"`
-	Money             float64 `description:"合同金额"`
-	PayMethod         string  `description:"付款方式"`
-	PayChannel        string  `description:"付款渠道"`
-	PermissionIds     string  `description:"权限id，多个用英文逗号隔开"`
-	ImgUrl            string  `description:"合同图片，多个用英文#隔开"`
-	PackageType       int     `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
-	RaiPackageType    int     `description:"权益套餐类型: 0-无; 1-70w套餐; 2-45w套餐"`
+	CompanyId         int                       `description:"客户id"`
+	CompanyApprovalId int                       `description:"申请单id，没有传0"`
+	ContractType      string                    `description:"合同类型，枚举值：'新签合同','续约合同','补充协议'"`
+	CompanyType       string                    `description:"客户类型，ficc/权益"`
+	StartDate         string                    `description:"合同开始日期"`
+	EndDate           string                    `description:"合同结束日期"`
+	Money             float64                   `description:"合同金额"`
+	PayMethod         string                    `description:"付款方式"`
+	PayChannel        string                    `description:"付款渠道"`
+	PermissionIds     string                    `description:"权限id，多个用英文逗号隔开"`
+	ImgUrl            string                    `description:"合同图片，多个用英文#隔开"`
+	PackageType       int                       `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
+	RaiPackageType    int                       `description:"权益套餐类型: 0-无; 1-70w套餐; 2-45w套餐"`
+	Points            float64                   `description:"研选扣点包点数"`
+	PointsArr         []ChartPermissionIdPoints `description:"行业下对应的点数"`
+}
+
+type ChartPermissionIdPoints struct {
+	ChartPermissionId int     `description:"权限ID"`
 	Points            float64 `description:"研选扣点包点数"`
 }