权益-非标转正主客观

controllers/approval.go

@@ -21,7 +21,7 @@ import (
 	"time"
 )
 
-//客户审批列表
+// 客户审批列表
 type ApprovalCommon struct {
 	BaseAuth
 }
@@ -509,7 +509,7 @@ func (c *ApprovalCommon) ApplyApproveOld() {
 			//}
 			//如果合同时间小于等于今天，那么立马执行合同内容
 			if time.Now().After(contractStartDate) {
-				_, err = company_approval.TryOutToFormal(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, contract.CompanyContractId, contract.StartDate, contract.EndDate, sysUser.RealName, companyProduct.ProductName, contract.PackageType)
+				_, err = company_approval.TryOutToFormal(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, contract.CompanyContractId, contract.StartDate, contract.EndDate, sysUser.RealName, companyProduct.ProductName, contract.PackageType, contract.RaiPackageType)
 				if err != nil {
 					c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 					return
@@ -581,7 +581,7 @@ func (c *ApprovalCommon) ApplyApproveOld() {
 
 			//如果合同时间小于等于今天，那么立马执行合同内容
 			if time.Now().After(contractStartDate) {
-				_, err = company_approval.ApplyServiceUpdate(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, contract.CompanyContractId, companyProduct.StartDate, contract.EndDate, sysUser.RealName, companyProduct.ProductName, contract.PackageType)
+				_, err = company_approval.ApplyServiceUpdate(req.CompanyId, productId, sysUser.AdminId, approvalItem.CompanyApprovalId, contract.CompanyContractId, companyProduct.StartDate, contract.EndDate, sysUser.RealName, companyProduct.ProductName, contract.PackageType, contract.RaiPackageType)
 				if err != nil {
 					c.FailWithMessage("审批失败", "审批失败,Err:"+err.Error())
 					return

controllers/company_contract.go

@@ -9,7 +9,7 @@ import (
 	"hongze/hongze_mobile_admin/utils"
 )
 
-//客户合同模块
+// 客户合同模块
 type CompanyContractCommon struct {
 	BaseAuth
 }
@@ -41,12 +41,12 @@ func (c *CompanyContractCommon) ApplyContractDetail() {
 		c.FailWithMessage("获取信息失败", "获取信息失败,Err:"+err.Error())
 		return
 	}
-	productId = detail.ProductId
-	if productId == 1 {
+
+	if detail.ProductId == utils.COMPANY_PRODUCT_FICC_ID {
 		for _, v := range utils.PermissionFiccClassifyArr {
 			checkList := make([]int, 0)
 			plist := new(company_report_permission.PermissionLookList)
-			items, err := company_report_permission.GetPermissionLookItems(productId, v)
+			items, err := company_report_permission.GetPermissionLookItems(detail.ProductId, v)
 			if err != nil {
 				c.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
 				return
@@ -66,56 +66,115 @@ func (c *CompanyContractCommon) ApplyContractDetail() {
 			plist.CheckList = checkList
 			detail.PermissionList = append(detail.PermissionList, plist)
 		}
-	} else {
+	}
+
+	if detail.ProductId == utils.COMPANY_PRODUCT_RAI_ID {
 		classifyName := "权益"
 		checkList := make([]int, 0)
 		plist := new(company_report_permission.PermissionLookList)
-		items, err := company_report_permission.GetPermissionLookItems(productId, classifyName)
+		plist.ClassifyName = classifyName
+		items, err := company_report_permission.GetPermissionLookItems(detail.ProductId, classifyName)
 		if err != nil {
 			c.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
 			return
 		}
-		mapUpgrade := make(map[int]int)
+
+		mapExpensive := make(map[int]bool) // 通过合同获取所勾选的买方研选5w
 		permissionList, err := company_report_permission.GetCompanyContractPermissionByCompanyContractId(companyContractId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			c.FailWithMessage("获取失败", "获取合同权限信息失败,Err:"+err.Error())
 			return
 		}
-		for _, v := range permissionList {
-			if v.IsUpgrade == 1 {
-				mapUpgrade[v.ChartPermissionId] = v.ChartPermissionId
+		permissions := make([]int, 0) // 合同权限IDs
+		checkItems := make([]*company_report_permission.PermissionLookItem, 0)
+		expMap := map[bool]string{false: "(3w)", true: "(5w)"} // 买方研选价格
+
+		// 未选大套餐, 走老逻辑
+		if detail.RaiPackageType == 0 {
+			mapUpgrade := make(map[int]bool) // 通过合同获取所勾选的升级行业权限
+
+			for _, v := range permissionList {
+				if v.IsUpgrade == 1 {
+					mapUpgrade[v.ChartPermissionId] = true
+				}
+				if v.ExpensiveYx == 1 {
+					mapExpensive[v.ChartPermissionId] = true
+				}
+				permissions = append(permissions, v.ChartPermissionId)
 			}
-		}
-		for _, n := range items {
-			count, err := company_contract.GetCompanyContractPermissionCheckByContractId(companyId, detail.CompanyContractId, n.ChartPermissionId)
-			if err != nil {
-				c.FailWithMessage("获取失败", "获取权限信息失败,Err:"+err.Error())
-				return
+			for _, n := range items {
+				if utils.InArrayByInt(permissions, n.ChartPermissionId) {
+					checkList = append(checkList, n.ChartPermissionId)
+					checkItems = append(checkItems, n)
+				}
 			}
-			if count > 0 {
-				checkList = append(checkList, n.ChartPermissionId)
+			plist.Items = checkItems
+			plist.CheckList = checkList
+			detail.PermissionList = append(detail.PermissionList, plist)
+
+			newPermissionLookList := contract.HandleEquityPermissionLookList(detail.PermissionList)
+
+			for _, cc := range newPermissionLookList {
+				if cc.ClassifyName != "权益" {
+					continue
+				}
+				for _, p := range cc.Items {
+					// 行业升级
+					if mapUpgrade[p.ChartPermissionId] {
+						p.PermissionName += "(升级)"
+						continue
+					}
+					// 买方研选
+					if p.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+						p.PermissionName += expMap[mapExpensive[p.ChartPermissionId]]
+					}
+				}
 			}
-			//n.PermissionName = n.Remark
+
+			detail.PermissionList = newPermissionLookList
 		}
-		plist.Items = items
-		plist.ClassifyName = classifyName
-		plist.CheckList = checkList
-		detail.PermissionList = append(detail.PermissionList, plist)
-		// CRM8.8-权限主客观合并
-		newPermissionLookList := contract.HandleEquityPermissionLookList(detail.PermissionList)
-		if len(mapUpgrade) > 0 {
-			for _, n := range newPermissionLookList {
-				if n.ClassifyName == "权益" {
-					for _, n2 := range n.Items {
-						if _, ok := mapUpgrade[n2.ChartPermissionId]; ok {
-							n2.PermissionName += "(升级)"
-						}
-					}
+
+		// 如果选择的是大套餐, 那么不再展示每个具体的权限, 除大套餐外还需遍历一下专家和研选3w/5w是否有选(这两个与大套餐不互斥, 可额外选择)
+		if detail.RaiPackageType > 0 {
+			// 大套餐
+			bigPackage := new(company_report_permission.PermissionLookItem)
+			if detail.RaiPackageType == 1 {
+				bigPackage.PermissionName = utils.CHART_PERMISSION_NAME_70W
+				bigPackage.ChartPermissionId = utils.CHART_PERMISSION_ID_70W
+				checkList = append(checkList, utils.CHART_PERMISSION_ID_70W)
+			}
+			if detail.RaiPackageType == 2 {
+				bigPackage.PermissionName = utils.CHART_PERMISSION_NAME_45W
+				bigPackage.ChartPermissionId = utils.CHART_PERMISSION_ID_45W
+				checkList = append(checkList, utils.CHART_PERMISSION_ID_45W)
+			}
+			checkItems = append(checkItems, bigPackage)
+
+			for _, v := range permissionList {
+				if v.ExpensiveYx == 1 {
+					mapExpensive[v.ChartPermissionId] = true
+				}
+				permissions = append(permissions, v.ChartPermissionId)
+			}
+			// 专家和研选
+			for _, n := range items {
+				if n.ChartPermissionId != utils.ZHUAN_JIA_ID && n.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN {
+					continue
+				}
+				if n.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+					n.PermissionName += expMap[mapExpensive[n.ChartPermissionId]]
+				}
+				if utils.InArrayByInt(permissions, n.ChartPermissionId) {
+					checkList = append(checkList, n.ChartPermissionId)
+					checkItems = append(checkItems, n)
 				}
 			}
+			plist.Items = checkItems
+			plist.CheckList = checkList
+			detail.PermissionList = append(detail.PermissionList, plist)
 		}
-		detail.PermissionList = newPermissionLookList
 	}
+
 	resp := companyContractResp.CompanyContractDetailResp{
 		detail,
 	}

models/tables/company_approval/company_approval.go

@@ -180,7 +180,7 @@ func GetApprovalCount(condition string, pars []interface{}) (count int, err erro
 }
 
 // TryOutToFormal 试用转正式
-func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (newCompanyReportPermissionList []*company_report_permission.CompanyReportPermission, err error) {
+func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string, packageType, raiPackageType int) (newCompanyReportPermissionList []*company_report_permission.CompanyReportPermission, err error) {
 	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
@@ -195,15 +195,15 @@ func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyCo
 	}()
 
 	// 当套餐类型为0时, 不更新套餐类型
-	sql := `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,approve_status='已审批',start_date=?,end_date=?,package_type=?,modify_time=NOW(),formal_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
+	sql := `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,approve_status='已审批',start_date=?,end_date=?,package_type=?,rai_package_type=?,modify_time=NOW(),formal_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
 	if packageType == 0 {
-		sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,approve_status='已审批',start_date=?,end_date=?,modify_time=NOW(),formal_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-		_, err = tx.Raw(sql, startDate, endDate, companyId, productId).Exec()
+		sql = `UPDATE company_product SET status='正式',try_out_time=NULL,last_description_time=NULL,freeze_time=NULL,renewal_intention=0,is_suspend=0,is_formal=1,approve_status='已审批',start_date=?,end_date=?,rai_package_type=?,modify_time=NOW(),formal_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
+		_, err = tx.Raw(sql, startDate, endDate, raiPackageType, companyId, productId).Exec()
 		if err != nil {
 			return
 		}
 	} else {
-		_, err = tx.Raw(sql, startDate, endDate, packageType, companyId, productId).Exec()
+		_, err = tx.Raw(sql, startDate, endDate, packageType, raiPackageType, companyId, productId).Exec()
 		if err != nil {
 			return
 		}
@@ -264,6 +264,7 @@ func TryOutToFormal(companyId, productId, sellerId, companyApprovalId, companyCo
 			Status:             "正式",
 			ModifyTime:         time.Now(),
 			IsUpgrade:          pv.IsUpgrade,
+			ExpensiveYx:        pv.ExpensiveYx,
 		}
 		newId, tmpErr := tx.Insert(tmpCompanyReportPermission)
 		if tmpErr != nil {
@@ -651,7 +652,7 @@ func ApplyReceive(companyId, productId, sysUserId, companyApprovalId, applyUserI
 }
 
 // ApplyServiceUpdate 申请服务更新
-func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string, packageType int) (newCompanyReportPermissionList []*company_report_permission.CompanyReportPermission, err error) {
+func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, companyContractId int, startDate, endDate, sellerName, productName string, packageType, raiPackageType int) (newCompanyReportPermissionList []*company_report_permission.CompanyReportPermission, err error) {
 	o := orm.NewOrm()
 	tx, err := o.Begin()
 	if err != nil {
@@ -734,14 +735,14 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 	//更新客户产品信息
 	if packageType == 0 {
 		// 套餐类型为0的时候, 不更新套餐
-		sql = `UPDATE company_product SET status='正式',is_formal=1,is_suspend=0,approve_status='已审批',start_date=?,end_date=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-		_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, companyId, productId).Exec()
+		sql = `UPDATE company_product SET status='正式',is_formal=1,is_suspend=0,approve_status='已审批',start_date=?,end_date=?,rai_package_type=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
+		_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, raiPackageType, companyId, productId).Exec()
 		if err != nil {
 			return
 		}
 	} else {
-		sql = `UPDATE company_product SET status='正式',is_formal=1,is_suspend=0,approve_status='已审批',start_date=?,end_date=?,package_type=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
-		_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, packageType, companyId, productId).Exec()
+		sql = `UPDATE company_product SET status='正式',is_formal=1,is_suspend=0,approve_status='已审批',start_date=?,end_date=?,package_type=?,rai_package_type=?,modify_time=NOW(),try_stage=1 WHERE company_id=? AND product_id=? `
+		_, err = tx.Raw(sql, updateStartDateTime, updateEndDateTime, packageType, raiPackageType, companyId, productId).Exec()
 		if err != nil {
 			return
 		}
@@ -793,7 +794,9 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 				nowPermission.ModifyTime = time.Now()
 				nowPermission.CompanyContractId = pv.CompanyContractId
 				nowPermission.Status = "正式"
-				_, err = tx.Update(nowPermission, "EndDate", "LastUpdatedTime", "ModifyTime", "CompanyContractId", "Status")
+				nowPermission.IsUpgrade = pv.IsUpgrade
+				nowPermission.ExpensiveYx = pv.ExpensiveYx
+				_, err = tx.Update(nowPermission, "EndDate", "LastUpdatedTime", "ModifyTime", "CompanyContractId", "Status", "IsUpgrade", "ExpensiveYx")
 				if err != nil {
 					return
 				}
@@ -819,9 +822,10 @@ func ApplyServiceUpdate(companyId, productId, sellerId, companyApprovalId, compa
 				ProductId:          productId,
 				ProductName:        productName,
 				//CompanyContractId:         companyContractId,
-				Status:     "正式",
-				ModifyTime: time.Now(),
-				//IsUpgrade:                 pv.IsUpgrade,
+				Status:      "正式",
+				ModifyTime:  time.Now(),
+				IsUpgrade:   pv.IsUpgrade,
+				ExpensiveYx: pv.ExpensiveYx,
 			}
 			newId, tmpErr := tx.Insert(nowPermission)
 			if tmpErr != nil {

models/tables/company_contract/company_contract.go

@@ -43,6 +43,7 @@ type CompanyContractDetail struct {
 	ModifyTime        time.Time `description:"合同修改时间"`
 	Status            int       `description:"状态"`
 	PackageType       int       `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
+	RaiPackageType    int       `description:"权益套餐类型: 0-无; 1-70w套餐; 2-45w套餐"`
 	Source            string    `description:"合同来源：上传附件, 系统合同"`
 	PermissionList    []*company_report_permission.PermissionLookList
 }
@@ -67,14 +68,14 @@ func GetCompanyContractPermissionCheckByContractId(companyId, companyContractId,
 	return
 }
 
-func GetCompanyContractDetailByContractIds(contractIds string) (list []*CompanyContract, err error)  {
+func GetCompanyContractDetailByContractIds(contractIds string) (list []*CompanyContract, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM company_contract WHERE company_contract_id in (` + contractIds + `)`
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
 
-//根据合同id集合字符串获取权限列表数据
+// 根据合同id集合字符串获取权限列表数据
 type CompanyContractPermissionName struct {
 	Id                  int       `orm:"column(id);pk" description:"客户合同id"`
 	CompanyId           int       `description:"客户id"`
@@ -97,4 +98,4 @@ func GetCompanyContractPermissionListByContractId(companyContractId int) (list [
 	sql := `SELECT a.*,b.chart_permission_name,b.classify_name FROM company_contract_permission AS a left join chart_permission b on a.chart_permission_id = b.chart_permission_id WHERE company_contract_id =? `
 	_, err = o.Raw(sql, companyContractId).QueryRows(&list)
 	return
-}
+}

models/tables/company_report_permission/company_report_permission.go

@@ -20,6 +20,7 @@ type CompanyReportPermission struct {
 	Status                    string    `description:"'正式','试用','关闭'"`
 	ModifyTime                time.Time `description:"修改时间"`
 	IsUpgrade                 int       `description:"是否升级，1是，0否"`
+	ExpensiveYx               int       `description:"权益研选: 0-3w; 1-5w"`
 }
 
 func GetCompanyReportPermissionCount(companyId, productId int) (count int, err error) {
@@ -52,6 +53,7 @@ type PermissionLookItem struct {
 	ClassifyName      string `description:"分类"`
 	Remark            string `description:"备注"`
 	IsUpgrade         int    `description:"是否升级，1是，0否"`
+	ExpensiveYx       int    `description:"权益研选: 0-3w; 1-5w"`
 }
 
 func GetCompanyPermissionCheck(companyId, permissionId int) (count int, err error) {
@@ -75,7 +77,7 @@ func GetPermissionLookItems(productId int, classifyName string) (items []*Permis
 	return
 }
 
-//GetCompanyContractPermissionByCompanyContractId 根据合同ID获取开通的权限
+// GetCompanyContractPermissionByCompanyContractId 根据合同ID获取开通的权限
 func GetCompanyContractPermissionByCompanyContractId(companyContractId int) (items []*PermissionLookItem, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM company_contract_permission WHERE company_contract_id =? ORDER BY modify_time DESC `

routers/commentsRouter.go

@@ -403,15 +403,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"],
-        beego.ControllerComments{
-            Method: "ApplyApproveOld",
-            Router: `/approve_old`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers:ApprovalCommon"],
         beego.ControllerComments{
             Method: "CompanyList",

services/company_approval/company_approval.go

@@ -30,7 +30,7 @@ import (
 )
 
 var sourceType = 1 //来源客户
-//提交审批
+// 提交审批
 func Apply(companyApprovalId int, messageContent string) (err error) {
 	//获取客户单详情
 	recodeInfo, err := company_approval.GetCompanyApprovalByApprovalId(companyApprovalId)
@@ -402,7 +402,7 @@ func Approved(approvalRecord *contract_approval_record.ContractApprovalRecord, o
 		// 客户单审批后的异步操作（修改客户单信息、修改合同权限等）
 		go afterApproved(recordInfo.CompanyApprovalId, opUser.AdminId, opUser.RealName)
 
-		if recordInfo.ProductId == 2 && recordInfo.CompanyContractId >0{
+		if recordInfo.ProductId == 2 && recordInfo.CompanyContractId > 0 {
 			//权益销售客户申请转正后，消息群发给所有销售
 			go services.AddCompanyApprovalMessageRai(recordInfo.CompanyId, recordInfo.CompanyContractId, recordInfo.ApplyRealName, companyInfo.CompanyName)
 		}
@@ -656,7 +656,7 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
 		if time.Now().After(contractStartDate) {
 			startDate = contractInfo.StartDate
 			endDate = contractInfo.EndDate
-			companyReportPermissionList, tmpErr = company_approval.TryOutToFormal(recodeInfo.CompanyId, recodeInfo.ProductId, opUser.AdminId, recodeInfo.CompanyApprovalId, contractInfo.CompanyContractId, contractInfo.StartDate, contractInfo.EndDate, opUser.RealName, companyProduct.ProductName, contractInfo.PackageType)
+			companyReportPermissionList, tmpErr = company_approval.TryOutToFormal(recodeInfo.CompanyId, recodeInfo.ProductId, opUser.AdminId, recodeInfo.CompanyApprovalId, contractInfo.CompanyContractId, contractInfo.StartDate, contractInfo.EndDate, opUser.RealName, companyProduct.ProductName, contractInfo.PackageType, contractInfo.RaiPackageType)
 			if tmpErr != nil {
 				err = errors.New("试用转正式失败,Err:" + tmpErr.Error())
 				return
@@ -735,7 +735,7 @@ func afterApproved(companyApprovalId int, opUserId int, opUserName string) (err
 
 		//如果合同时间小于等于今天，那么立马执行合同内容
 		if time.Now().After(contractStartDate) {
-			companyReportPermissionList, err = company_approval.ApplyServiceUpdate(recodeInfo.CompanyId, recodeInfo.ProductId, opUser.AdminId, recodeInfo.CompanyApprovalId, recodeInfo.CompanyContractId, companyProduct.StartDate, contractInfo.EndDate, opUser.RealName, companyProduct.ProductName, contractInfo.PackageType)
+			companyReportPermissionList, err = company_approval.ApplyServiceUpdate(recodeInfo.CompanyId, recodeInfo.ProductId, opUser.AdminId, recodeInfo.CompanyApprovalId, recodeInfo.CompanyContractId, companyProduct.StartDate, contractInfo.EndDate, opUser.RealName, companyProduct.ProductName, contractInfo.PackageType, contractInfo.RaiPackageType)
 			if tmpErr != nil {
 				err = errors.New(fmt.Sprint("正式客户申请服务更新失败，执行失败;Err:" + tmpErr.Error()))
 				return
@@ -1001,7 +1001,7 @@ func CheckApproveAuth(companyId, productId int, opUser *custom.AdminWx) (approva
 	return
 }
 
-//获取审批流和权限
+// 获取审批流和权限
 func GetOpButton(approvalItem *company_approval.CompanyApprovalList, contractApprovalInfo *contract_approval.ContractApproval, opUser *custom.AdminWx) (flowNodeListResp [][]contract_approval_record.ContractApprovalRecord, err error) {
 	//审批流
 	approvalRecordList, err := contract_approval_record.GetContractApprovalRecordListByContractApprovalId(contractApprovalInfo.ContractApprovalId)
@@ -1057,7 +1057,7 @@ func GetApprovalDetailByCompanyApprovalId(companyApprovalId int, opUser *custom.
 		if e == nil {
 			if companyContractDetail.Source == "系统合同" {
 				approvalItem.ContractSourceTag = "标准合同"
-			}else{
+			} else {
 				approvalItem.ContractSourceTag = "非标合同"
 			}
 		}

utils/constants.go

@@ -4,7 +4,7 @@ const (
 	Md5Key = ""
 )
 
-//常量定义
+// 常量定义
 const (
 	FormatTime            = "15:04:05"                //时间格式
 	FormatDate            = "2006-01-02"              //日期格式
@@ -23,19 +23,19 @@ const (
 	EmailSendToUsers = "317699326@qq.com;984198890@qq.com"
 )
 
-//手机号，电子邮箱正则
+// 手机号，电子邮箱正则
 const (
 	RegularMobile = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0-9])|(17[0-9])|(16[0-9])|(19[0-9]))\\d{8}$" //手机号码
 	RegularEmail  = `\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*`                                             //匹配电子邮箱
 )
 
-//验证码code
+// 验证码code
 const (
 	REGISTER_CODE = iota + 1 //注册
 	LOGIN_CODE               //登录
 )
 
-//聚合短信
+// 聚合短信
 var (
 	JhGnTplId  = "65692"                            //聚合国内模板编码
 	JhGjTplId  = "10054"                            //聚合国内模板编码
@@ -43,7 +43,7 @@ var (
 	JhGjAppKey = "3326ad2c1047a4cd92ace153e6044ca3"
 )
 
-//客户状态
+// 客户状态
 const (
 	COMPANY_STATUS_TRY_OUT       = "试用"
 	COMPANY_STATUS_FOREVER       = "永续"
@@ -56,8 +56,8 @@ const (
 	COMPANY_APPROVE_STATUS = "待审批"
 )
 
-//管理员，ficc管理员，ficc销售，权益管理员，权益销售。
-//角色类型/类型编码
+// 管理员，ficc管理员，ficc销售，权益管理员，权益销售。
+// 角色类型/类型编码
 const (
 	ROLE_TYPE_ADMIN       = "管理员"
 	ROLE_TYPE_FICC_ADMIN  = "ficc管理员"
@@ -89,7 +89,7 @@ const (
 	ROLE_TYPE_SELLERS = "'ficc_admin','ficc_seller','rai_admin','rai_seller','ficc_group','rai_group','ficc_department','rai_department','compliance'"
 )
 
-//客户类型
+// 客户类型
 const (
 	COMPANY_CLASSIFY_FICC    = "ficc"
 	COMPANY_CLASSIFY_RAI     = "权益"
@@ -106,14 +106,14 @@ const (
 var PermissionFiccClassifyArr = [...]string{"宏观经济", "化工产业", "建材产业", "有色产业"}
 var PermissionAllClassifyArr = [...]string{"宏观经济", "化工产业", "建材产业", "有色产业", "权益"}
 
-//缓存key
+// 缓存key
 const (
-	CACHE_KEY_LOGS     = "HZ_ADMIN_CACHE_KEY_LOGS" //api用户操作日志队列
-	CACHE_KEY_ADMIN    = "calendar:admin:list"     //系统用户列表缓存key
-	CACHE_KEY_ADMIN_ID = "calendar:admin:id:list"  //系统用户列表缓存key
-	HZ_MOBILE_ADMIN_WXLOGIN_TOKEN = "hz_mobile_admin:wxLogin:admin_token:"
+	CACHE_KEY_LOGS                      = "HZ_ADMIN_CACHE_KEY_LOGS" //api用户操作日志队列
+	CACHE_KEY_ADMIN                     = "calendar:admin:list"     //系统用户列表缓存key
+	CACHE_KEY_ADMIN_ID                  = "calendar:admin:id:list"  //系统用户列表缓存key
+	HZ_MOBILE_ADMIN_WXLOGIN_TOKEN       = "hz_mobile_admin:wxLogin:admin_token:"
 	HZ_MOBILE_ADMIN_WXLOGIN_MOBILE_CODE = "hz_mobile_admin:wxLogin:mobile_code:"
-	HZ_ADMIN_WX_ACCESS_TOEKN = "hz_admin:wx:access_token:"
+	HZ_ADMIN_WX_ACCESS_TOEKN            = "hz_admin:wx:access_token:"
 )
 
 // 微信用户user_record注册平台
@@ -126,7 +126,7 @@ const (
 	USER_RECORD_PLATFORM_YB // 研报小程序
 )
 
-//模板消息推送类型
+// 模板消息推送类型
 const (
 	TEMPLATE_MSG_REPORT                = iota + 1 //日度点评报告推送
 	TEMPLATE_MSG_INDEX                            //指标更新
@@ -151,16 +151,21 @@ const (
 	TEMPLATE_MSG_CYGX_ROADSHOW_VIDEO              //查研观向微路演视频 21
 )
 
-
 const (
 	SendTemplateMsgAuthorization = "dc855fce962a639faa779cbdd4cd332f"
 )
 
 const (
-	LU_YAN_FU_WU                            = "路演服务"
-	CE_LUE_NAME                      string = "策略"
-	YI_YAO_NAME                      string = "医药"
-	XIAO_FEI_NAME                    string = "消费"
-	KE_JI_NAME                       string = "科技"
-	ZHI_ZAO_NAME                     string = "智造"
-)
+	LU_YAN_FU_WU                       = "路演服务"
+	CHART_PERMISSION_ID_YANXUAN        = 31
+	CE_LUE_NAME                 string = "策略"
+	YI_YAO_NAME                 string = "医药"
+	XIAO_FEI_NAME               string = "消费"
+	KE_JI_NAME                  string = "科技"
+	ZHI_ZAO_NAME                string = "智造"
+	ZHUAN_JIA_ID                int    = 29
+	CHART_PERMISSION_NAME_70W          = "70w大套餐" // 权益70w大套餐名称
+	CHART_PERMISSION_ID_70W            = 2001     // 权益70w大套餐表示的权限ID(自定义)
+	CHART_PERMISSION_NAME_45W          = "45w大套餐" // 权益45w大套餐名称
+	CHART_PERMISSION_ID_45W            = 2002     // 权益45w大套餐表示的权限ID(自定义)
+)