no message

controllers/company_apply_v2.go

@@ -256,6 +256,13 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
 		}
 		permissionArr := strings.Split(req.PermissionIds, ",")
 		permissionMap := make(map[int]int) //权限id的map集合，用来避免重复添加权限校验
+
+		permissionNameMap, err := services.GetPermissionNameMap()
+		if err != nil {
+			br.Msg = "新增合同失败"
+			br.ErrMsg = "获取权限名称失败,Err:" + err.Error()
+			return
+		}
 		for _, v := range permissionArr {
 			item := new(company.CompanyContractPermission)
 			item.CompanyId = req.CompanyId
@@ -274,7 +281,11 @@ func (this *CompanyApplyController) ApplyServiceUpdate() {
 			permissionMap[chartPermissionId] = chartPermissionId
 
 			item.ChartPermissionId = chartPermissionId
-
+			item.PermissionName = permissionNameMap[chartPermissionId]
+			//如果是研选扣点包的权限，写入扣点点数
+			if chartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+				item.Points = req.Points
+			}
 			item.StartDate = req.StartDate
 			item.EndDate = req.EndDate
 			item.IsUpgrade = mapPermissionIdUpgrade[chartPermissionId]

controllers/cygx/contract_allocation.go

@@ -569,6 +569,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 			//手动拼接研选订阅的数据类型
 			listYxItem := new(cygx.AllocationRealNameListResp)
 			listYxItem.RealName = utils.CHART_PERMISSION_NAME_MF_YANXUAN
+			listYxItem.Money = moneyYx
 			listYxItem.ChartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN
 			respItemYx.List = append(respItemYx.List, listYxItem)
 		}
@@ -581,6 +582,7 @@ func (this *ContractAllocationController) CompanyContracDetail() {
 
 			listKouDianItem := new(cygx.AllocationRealNameListResp)
 			listKouDianItem.RealName = utils.YAN_XUAN_KOU_DIAN_BAO_NAME
+			listKouDianItem.Money = pointMoney
 			listKouDianItem.ChartPermissionId = utils.YAN_XUAN_KOU_DIAN_BAO_ID
 			respItemYxKouDian.List = append(respItemYxKouDian.List, listKouDianItem)
 		}

models/company/company_apply.go

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