Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_web_mfyx into mfyx_3.0

services/activity.go

@@ -1388,6 +1388,18 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 			return
 		}
 	}
+
+	//如果正式权限有开通 研选扣点包 ，那么就拼接一个 研选订阅的权限
+	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

@@ -77,8 +77,9 @@ const (
 	CHART_PERMISSION_NAME_YANXUAN    string = "研选"
 	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
+	CHART_PERMISSION_ID_YANXUAN      int    = 31      //权限研选订阅id
+	YAN_XUAN_KOU_DIAN_BAO_ID         int    = 52      //研选扣点包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