浏览代码

no message

xingzai 1 年之前
父节点
当前提交
0e8cafdba5
共有 3 个文件被更改,包括 33 次插入29 次删除
  1. 2 2
      controllers/article.go
  2. 30 26
      services/user_permission.go
  3. 1 1
      utils/constants.go

+ 2 - 2
controllers/article.go

@@ -130,7 +130,7 @@ func (this *ArticleNoLoginController) Detail() {
 		}
 	}
 
-	//HasPermission int `description:"1:有该行业权限,正常展示,2:无该行业权限,不存在权益客户下(ficc),3:无该品类权限,已提交过申请,4:无该品类权限,未提交过申请,5:潜在客户,未提交过申请,6:潜在客户,已提交过申请"`
+	//HasPermission int `description:"1:有该行业权限,正常展示,2:无该行业权限,不存在权益客户下(ficc),3:无该品类权限,已提交过申请,4:无该品类权限,未提交过申请,7:潜在客户,未提交过申请,6:潜在客户,已提交过申请"`
 	if user.CompanyId > 1 {
 		companyPermission, err := models.GetCompanyPermission(user.CompanyId)
 		if err != nil {
@@ -258,7 +258,7 @@ func (this *ArticleNoLoginController) Detail() {
 		if applyCount > 0 {
 			hasPermission = 6
 		} else {
-			hasPermission = 5
+			hasPermission = 7
 		}
 	}
 Loop:

+ 30 - 26
services/user_permission.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"errors"
+	"fmt"
 	"hongze/hongze_web_mfyx/models"
 	"hongze/hongze_web_mfyx/utils"
 	"strings"
@@ -207,25 +208,26 @@ func GetUserPermissionCode(userId, companyId int) (permission int, err error) {
 		err = errors.New("获取用户申请信息失败, Err: " + e.Error())
 		return
 	}
-	//权益客户
-	raiCount, e := models.GetCompanyProductCount(companyId, utils.COMPANY_PRODUCT_RAI_ID)
-	if e != nil {
-		err = errors.New("获取用户申请信息失败, Err: " + e.Error())
-		return
-	}
-	if raiCount == 1 {
+
+	if companyId == 1 {
+		// 潜在用户
 		if applyCount > 0 {
-			permission = 2
+			permission = 6
 		} else {
-			permission = 3
+			permission = 7
 		}
 	} else {
-		if companyId == 1 {
-			// 潜在用户
+		//权益客户
+		raiCount, e := models.GetCompanyProductCount(companyId, utils.COMPANY_PRODUCT_RAI_ID)
+		if e != nil {
+			err = errors.New("获取用户申请信息失败, Err: " + e.Error())
+			return
+		}
+		if raiCount == 1 {
 			if applyCount > 0 {
-				permission = 6
+				permission = 2
 			} else {
-				permission = 7
+				permission = 3
 			}
 		} else {
 			//ficc 客户
@@ -254,26 +256,27 @@ func GetUserDetailPermissionCode(userId, companyId int) (permission int, err err
 		err = errors.New("获取用户申请信息失败, Err: " + e.Error())
 		return
 	}
-	//权益客户
-	raiCount, e := models.GetCompanyProductCount(companyId, utils.COMPANY_PRODUCT_RAI_ID)
-	if e != nil {
-		err = errors.New("获取用户申请信息失败, Err: " + e.Error())
-		return
-	}
-	if raiCount == 1 {
+	fmt.Println("companyId", companyId)
+	if companyId == 1 {
+		// 潜在用户
 		if applyCount > 0 {
-			permission = 2
+			permission = 6
 		} else {
-			permission = 3
+			permission = 7
 		}
 	} else {
+		//权益客户
+		raiCount, e := models.GetCompanyProductCount(companyId, utils.COMPANY_PRODUCT_RAI_ID)
+		if e != nil {
+			err = errors.New("获取用户申请信息失败, Err: " + e.Error())
+			return
+		}
 
-		if companyId == 1 {
-			// 潜在用户
+		if raiCount == 1 {
 			if applyCount > 0 {
-				permission = 6
+				permission = 2
 			} else {
-				permission = 7
+				permission = 3
 			}
 		} else {
 			//ficc 客户
@@ -291,5 +294,6 @@ func GetUserDetailPermissionCode(userId, companyId int) (permission int, err err
 			}
 		}
 	}
+	fmt.Println("permission", permission)
 	return
 }

+ 1 - 1
utils/constants.go

@@ -91,7 +91,7 @@ const (
 	ZHI_ZAO_ID                       int    = 19
 	SummaryArticleId                 int    = 1000000
 	StrategyPlatform                 string = "https://vmp.hzinsights.com/v2/articles/"
-	DefaultHeadimgurl                string = "https://hzstatic.hzinsights.com/static/temp/20220426202204/20220426/P5qLR2zzfBdKItp3eX2Du1tvq9Ba.jpg"
+	DefaultHeadimgurl                string = "https://hzstatic.hzinsights.com/static/images/202401/20240103/u6Ykx23BMTnwtvYhZnJktgD54MLp.png"
 	OPEN_TOKEN_KEY                   string = "CLPT_OPEN_TOKEN_KEY" //策略品台开放平台的token key
 	OnlineTime                       string = "2021-06-01 00:00:01" //上线时间
 	HONG_GUAN_ID                     int    = 1