Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into cygx_need_911

controllers/activity.go

@@ -753,16 +753,17 @@ func (this *ActivityController) Detail() {
 		return
 	}
 	resp.IsResearchSpecial = isResearchSpecial
+	detailResp := services.ActivityButtonShow(activityInfo, user, make([]string, 0))
+	detailResp, err = services.ActivityDetaailShow(detailResp)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "ActivityDetaailShow Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
+		return
+	}
 	if havePower {
 		resp.HasPermission = 1
 		//permissionArr := make([]string, 0)
-		detailResp := services.ActivityButtonShow(activityInfo, user, make([]string, 0))
-		detailResp, err = services.ActivityDetaailShow(detailResp)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "ActivityDetaailShow Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
-			return
-		}
+
 		//处理活动关联的产业
 		industrialList, err := models.GetIndustrialActivityGroupManagementList(activityId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -887,6 +888,8 @@ func (this *ActivityController) Detail() {
 		resp.SellerName = sellerName
 		resp.SellerMobile = sellerMobile
 	}
+	detailResp.AuthInfo.HasPermission = resp.HasPermission
+
 	// 判断是否属于研选类型的活动
 	if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 		resp.IsResearch = true

controllers/article.go

@@ -136,10 +136,18 @@ func (this *ArticleController) Detail() {
 			br.ErrMsg = "判断是否已申请访谈失败，Err:" + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
 			return
 		}
+		//permissionNameArr := strings.Split(companyPermission, ",")
 		//判断用户是否开通了个人研选权限，如果有权限后缀拼接权限名称
 		mfyxUserPermissionTotal := services.GetMfyxUserPermissionTotal(uid)
 		if mfyxUserPermissionTotal == 1 {
 			companyPermission += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
+			companyPermission += "," + utils.MAI_FANG_YAN_XUAN_NAME
+			//permissionNameArr = append(permissionNameArr, utils.CHART_PERMISSION_NAME_MF_YANXUAN)
+			//permissionNameArr = append(permissionNameArr, utils.MAI_FANG_YAN_XUAN_NAME)
+		}
+		//如果有研选订阅的权限，那么就拼接一个 买方研选的权限做校验
+		if strings.Contains(companyPermission, utils.CHART_PERMISSION_NAME_MF_YANXUAN) {
+			companyPermission += "," + utils.MAI_FANG_YAN_XUAN_NAME
 		}
 		detail, err = models.GetArticleDetailById(articleId)
 		if err != nil {
@@ -183,6 +191,7 @@ func (this *ArticleController) Detail() {
 			slice := strings.Split(articlePermissionName, ",")
 			for _, v := range slice {
 				if strings.Contains(companyPermission, v) {
+					//if utils.InArrayByStr(permissionNameArr, v) {
 					hasPersion = true
 				}
 			}

controllers/chart_permission.go

@@ -40,6 +40,12 @@ func (this *ChartPermissionController) Detail() {
 		return
 	}
 	resp := new(models.ChartPermissionListResp)
+
+	for _, v := range list {
+		if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+			v.PermissionName = utils.MAI_FANG_YAN_XUAN_NAME
+		}
+	}
 	resp.List = list
 	br.Ret = 200
 	br.Success = true
@@ -105,6 +111,11 @@ func (this *MobileChartPermissionAuthController) ListByActivity() {
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
+	for _, v := range list {
+		if v.PermissionName == utils.CHART_PERMISSION_NAME_MF_YANXUAN {
+			v.PermissionName = utils.MAI_FANG_YAN_XUAN_NAME
+		}
+	}
 	resp := new(models.ChartPermissionListResp)
 	if user.CompanyId > 1 {
 		chartList, err := models.GetUserCompanyPermissionSand(user.CompanyId)

services/activity.go

@@ -741,6 +741,11 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 		e = errors.New("获取用户权限失败, Err: " + e.Error())
 		return
 	}
+
+	if utils.InArrayByStr(permissionArr, utils.YAN_XUAN_KOU_DIAN_BAO_NAME) {
+		permissionArr = append(permissionArr, utils.CHART_PERMISSION_NAME_MF_YANXUAN)
+	}
+
 	//如果是易董同步过来的，只展示外部资源标签
 	if activityDetail.YidongActivityId != "" {
 		activityDetail.IsExternalLabel = true
@@ -1308,6 +1313,18 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	if mfyxUserPermissionTotal == 1 {
 		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
 	}
+
+	//如果正式权限有开通 研选扣点包 ，那么就拼接一个 研选订阅的权限
+	if strings.Contains(permissionStrZhengShi, utils.YAN_XUAN_KOU_DIAN_BAO_NAME) {
+		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
+		permissionStrZhengShi += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
+	}
+
+	//如果测试权限有开通 研选扣点包 ，那么就拼接一个 研选订阅的权限
+	if strings.Contains(permissionStr, utils.YAN_XUAN_KOU_DIAN_BAO_NAME) {
+		permissionStr += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
+	}
+
 	//如果一个权限都没有就返回无权限
 	if permissionStr == "" {
 		return

utils/constants.go

@@ -73,8 +73,11 @@ const (
 	CE_LUE_NAME                      string = "策略"
 	CE_LUE_ID                        int    = 23
 	CHART_PERMISSION_NAME_YANXUAN    string = "研选"
-	CHART_PERMISSION_NAME_MF_YANXUAN string = "买方研选"
-	CHART_PERMISSION_ID_YANXUAN      int    = 31
+	MAI_FANG_YAN_XUAN_NAME           string = "买方研选"
+	CHART_PERMISSION_NAME_MF_YANXUAN string = "研选订阅"
+	CHART_PERMISSION_ID_YANXUAN      int    = 31      //权限研选订阅id
+	YAN_XUAN_KOU_DIAN_BAO_ID         int    = 52      //研选扣点包ID
+	YAN_XUAN_KOU_DIAN_BAO_NAME       string = "研选扣点包" //研选扣点包ID
 	YI_YAO_NAME                      string = "医药"
 	YI_YAO_OTHER_IMG                 string = "https://hzstatic.hzinsights.com/static/temp/20221118202211/20221118/qzPm61bVf40Je7c5iL1s4CbrDcpv.png" //医药其它图片
 	YI_YAO_ID                        int    = 22