no message

controllers/company_contract.go

@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"fmt"
 	companyContractResp "hongze/hongze_mobile_admin/models/response/company_contract"
 	"hongze/hongze_mobile_admin/models/tables/company_contract"
 	"hongze/hongze_mobile_admin/models/tables/company_report_permission"
@@ -88,9 +89,10 @@ func (c *CompanyContractCommon) ApplyContractDetail() {
 		}
 		permissions := make([]int, 0) // 合同权限IDs
 		checkItems := make([]*company_report_permission.PermissionLookItem, 0)
-		expMap := map[bool]string{false: "(3w)", true: "(5w)"} // 买方研选价格
-		var expensiveYx int
+		//expMap := map[bool]string{false: "(3w)", true: "(5w)"} // 买方研选价格
+		//var expensiveYx int
 		// 未选大套餐, 走老逻辑
+		var points float64
 		if detail.RaiPackageType == 0 {
 			mapUpgrade := make(map[int]bool) // 通过合同获取所勾选的升级行业权限
 
@@ -100,11 +102,17 @@ func (c *CompanyContractCommon) ApplyContractDetail() {
 				}
 				if v.ExpensiveYx > 0 {
 					mapExpensive[v.ChartPermissionId] = true
-					expensiveYx = v.ExpensiveYx
+					//expensiveYx = v.ExpensiveYx
+				}
+				if v.Points > 0 && v.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+					points = v.Points
 				}
 				permissions = append(permissions, v.ChartPermissionId)
 			}
 			for _, n := range items {
+				if points > 0 && n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+					n.PermissionName += fmt.Sprint("（", points, "点）")
+				}
 				if utils.InArrayByInt(permissions, n.ChartPermissionId) {
 					checkList = append(checkList, n.ChartPermissionId)
 					checkItems = append(checkItems, n)
@@ -135,14 +143,14 @@ func (c *CompanyContractCommon) ApplyContractDetail() {
 						continue
 					}
 					// 买方研选
-					if p.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
-						if expensiveYx == 1 {
-							p.PermissionName += "(5w)"
-						} else if expensiveYx == 2 {
-							p.PermissionName += "(10w)"
-						}
-						//p.PermissionName += expMap[mapExpensive[p.ChartPermissionId]]
-					}
+					//if p.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+					//	if expensiveYx == 1 {
+					//		p.PermissionName += "(5w)"
+					//	} else if expensiveYx == 2 {
+					//		p.PermissionName += "(10w)"
+					//	}
+					//	//p.PermissionName += expMap[mapExpensive[p.ChartPermissionId]]
+					//}
 				}
 			}
 
@@ -169,15 +177,21 @@ func (c *CompanyContractCommon) ApplyContractDetail() {
 				if v.ExpensiveYx == 1 {
 					mapExpensive[v.ChartPermissionId] = true
 				}
+				if v.Points > 0 && 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.ZHUAN_JIA_ID && n.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN {
+				if n.ChartPermissionId != utils.ZHUAN_JIA_ID && n.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN && n.ChartPermissionId != utils.YAN_XUAN_KOU_DIAN_BAO_ID {
 					continue
 				}
-				if n.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
-					n.PermissionName += expMap[mapExpensive[n.ChartPermissionId]]
+				//if n.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
+				//	n.PermissionName += expMap[mapExpensive[n.ChartPermissionId]]
+				//}
+				if n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+					n.PermissionName += fmt.Sprint("（", points, "点）")
 				}
 				if utils.InArrayByInt(permissions, n.ChartPermissionId) {
 					checkList = append(checkList, n.ChartPermissionId)

models/tables/company_report_permission/company_report_permission.go

@@ -44,16 +44,17 @@ 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:"分类"`
-	Remark            string `description:"备注"`
-	IsUpgrade         int    `description:"是否升级，1是，0否"`
-	ExpensiveYx       int    `description:"权益研选: 0-3w; 1-5w"`
+	ChartPermissionId int     `description:"权限id"`
+	PermissionName    string  `description:"权限名称"`
+	StartDate         string  `description:"权限开始日期"`
+	EndDate           string  `description:"权限结束日期"`
+	Status            string  `description:"'正式','试用','关闭'"`
+	ExpireDay         string  `description:"到期天数"`
+	ClassifyName      string  `description:"分类"`
+	Remark            string  `description:"备注"`
+	IsUpgrade         int     `description:"是否升级，1是，0否"`
+	ExpensiveYx       int     `description:"权益研选: 0-3w; 1-5w"`
+	Points            float64 `description:"研选扣点包点数"`
 }
 
 func GetCompanyPermissionCheck(companyId, permissionId int) (count int, err error) {

utils/constants.go

@@ -160,6 +160,7 @@ const (
 const (
 	LU_YAN_FU_WU                            = "路演服务"
 	CHART_PERMISSION_ID_YANXUAN             = 31
+	YAN_XUAN_KOU_DIAN_BAO_ID         int    = 52 //研选扣点包ID
 	CE_LUE_NAME                      string = "策略"
 	YI_YAO_NAME                      string = "医药"
 	XIAO_FEI_NAME                    string = "消费"