|
@@ -158,8 +158,8 @@ func (this *CompanyApplyController) ApplyContractHistoryList() {
|
|
|
if match == nil {
|
|
|
continue
|
|
|
}
|
|
|
- //研选、专家也要单独处理
|
|
|
- if n.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN || n.ChartPermissionId == utils.ZHUAN_JIA_ID {
|
|
|
+ //研选订阅、研选扣点包、专家也要单独处理
|
|
|
+ if n.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN || n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID || n.ChartPermissionId == utils.ZHUAN_JIA_ID {
|
|
|
if n.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
|
|
|
if expensiveYx == 1 {
|
|
|
n.PermissionName += "(5w)"
|
|
@@ -169,6 +169,10 @@ func (this *CompanyApplyController) ApplyContractHistoryList() {
|
|
|
//n.PermissionName += "(3w)"
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ if n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID && n.Points > 0 {
|
|
|
+ n.PermissionName += "(" + fmt.Sprint(n.Points) + ")点"
|
|
|
+ }
|
|
|
checkList = append(checkList, n.ChartPermissionId)
|
|
|
checkItems = append(checkItems, n)
|
|
|
}
|
|
@@ -189,8 +193,8 @@ func (this *CompanyApplyController) ApplyContractHistoryList() {
|
|
|
checkItems = append(checkItems, n)
|
|
|
continue
|
|
|
}
|
|
|
- // 买方研选(3w/5w)
|
|
|
- if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
|
|
|
+ // 买方研选(3w/5w)、 研选扣点包,拼接点数
|
|
|
+ if n.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN || n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
|
|
|
if expensiveYx == 1 {
|
|
|
n.PermissionName += "(5w)"
|
|
|
} else if expensiveYx == 2 {
|
|
@@ -198,6 +202,10 @@ func (this *CompanyApplyController) ApplyContractHistoryList() {
|
|
|
} else if expensiveYx == 0 {
|
|
|
//n.PermissionName += "(3w)"
|
|
|
}
|
|
|
+
|
|
|
+ if n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID && n.Points > 0 {
|
|
|
+ n.PermissionName += "(" + fmt.Sprint(n.Points) + ")点"
|
|
|
+ }
|
|
|
//n.PermissionName += expMap[match.ExpensiveYx]
|
|
|
checkList = append(checkList, n.ChartPermissionId)
|
|
|
checkItems = append(checkItems, n)
|