Merge branch 'cygx_13.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/chart_permission.go

@@ -66,11 +66,18 @@ func (this *ChartPermissionAuthController) Detail() {
 	}
 	resp := new(models.ChartPermissionResp)
 	for k, v := range list {
+		//研选订阅包不进行展示
+		if v.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID {
+			continue
+		}
 		if userType == 1 {
 			if v.PermissionName != "研选" {
 				resp.List = append(resp.List, v)
 			}
 		} else {
+			if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+				v.PermissionName = "买方研选"
+			}
 			resp.List = append(resp.List, v)
 		}
 		if services.GetShowSustainable() && v.PermissionName == "研选" {

services/activity.go

@@ -582,6 +582,11 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
 	}
 
+	//如果用户开通了研选扣点包，但是没开通研选订阅，那么就拼接一个研选订阅的权限名称
+	if !strings.Contains(permissionStr, utils.CHART_PERMISSION_NAME_MF_YANXUAN) && strings.Contains(permissionStr, utils.YAN_XUAN_KOU_DIAN_BAO_NAME) {
+		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
+	}
+
 	//如果一个权限都没有就返回无权限
 	if permissionStr == "" {
 		return

utils/constants.go

@@ -80,10 +80,11 @@ const (
 const (
 	CHART_PERMISSION_NAME_YANXUAN    string = "研选"
 	CHART_PERMISSION_NAME_MF_YANXUAN string = "研选订阅"
-	CHART_PERMISSION_ID_YANXUAN      int    = 31 //权限研选订阅id
-	YAN_XUAN_KOU_DIAN_BAO_ID         int    = 52 //研选扣点包ID
-	C_CLASS_ACTIVITY_TYPE_ID         int    = 7  //C类电话会会议ID
-	ANALYST_TELL_ACTIVITY_TYPE_ID    int    = 2  //分析师电话会ID
+	CHART_PERMISSION_ID_YANXUAN      int    = 31      //权限研选订阅id
+	YAN_XUAN_KOU_DIAN_BAO_ID         int    = 52      //研选扣点包ID
+	YAN_XUAN_KOU_DIAN_BAO_NAME       string = "研选扣点包" //研选扣点包ID
+	C_CLASS_ACTIVITY_TYPE_ID         int    = 7       //C类电话会会议ID
+	ANALYST_TELL_ACTIVITY_TYPE_ID    int    = 2       //分析师电话会ID
 	CE_LUE_NAME                      string = "策略"
 	CE_LUE_ID                        int    = 23
 	YI_YAO_NAME                      string = "医药"