画像新增区别是否是免费试用标识

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -39,30 +39,31 @@ func CreatePortraitManager(userid string, pageFlag string) (*Portrait, bool, err
 }
 
 //CreateSubVipPortraitManager 超级订阅权限校验
-func CreateSubVipPortraitManager(userid string, pageFlag, searchValue string, isWinner bool) (*Portrait, bool, error) {
+//int -1无权限 1有权限 2大会员次数 3使用
+func CreateSubVipPortraitManager(userid string, pageFlag, searchValue string, isWinner bool) (*Portrait, int, error) {
 	if userid == "" {
-		return nil, false, errors.New("未登录")
+		return nil, -1, errors.New("未登录")
 	}
 	if pageFlag == "" {
-		return nil, false, errors.New("未知请求")
+		return nil, -1, errors.New("未知请求")
 	}
 	if pageFlag != "entDetail" { //需要权限校验的接口
 		bigMsg := jy.GetBigVipUserBaseMsg(userid, db.Mysql, db.Mgo)
 		if bigMsg.VipStatus <= 0 || bigMsg.Vip_BuySet.Upgrade != 1 { //免费用户留资体验
 			if searchValue != "" && jy.Portraitexperience(userid, searchValue, isWinner) {
-				return &Portrait{userid}, true, nil
+				return &Portrait{userid}, 3, nil
 			}
 			if !(pageFlag == "buyerPortraitNotCheckPower" || pageFlag == "buyerPortrait_newMsg" || pageFlag == "buyerPortrait_select") {
-				return nil, false, errors.New("非法请求")
+				return nil, -1, errors.New("非法请求")
 			}
-			return nil, false, nil
+			return nil, -1, nil
 		} else { //超级订阅升级版-校验超级订阅画像浏览次数
 			if err := bigMsg.SubVipPortraitTimesCheck(db.Mysql, searchValue, isWinner); err != nil {
-				return nil, true, err
+				return nil, 2, err
 			}
 		}
 	}
-	return &Portrait{userid}, true, nil
+	return &Portrait{userid}, 1, nil
 }
 
 //获取企业基本信息

src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -129,7 +129,7 @@ func (this *SubVipPortrait) SubVipPortrait() {
 		if entId == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		cepm, _, err := entity.CreateSubVipPortraitManager(userId, "entPortrait", entId, true)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "entPortrait", entId, true)
 		if err != nil {
 			return nil, err
 		}
@@ -141,8 +141,11 @@ func (this *SubVipPortrait) SubVipPortrait() {
 			Area:       this.GetString("area"),
 			ScopeClass: this.GetString("scopeClass"),
 			TimeRange:  this.GetString("timeRange"),
-			HasPower:   true,
+			HasPower:   power > 0,
 		})
+		if power == 3 {
+			rData["onTrial"] = true
+		}
 		return rData, nil
 	}()
 	if errMsg != nil {
@@ -267,7 +270,7 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 		}
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
-		cepm, hasPower, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait_newMsg", buyer, false)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait_newMsg", buyer, false)
 		if err != nil {
 			return nil, err
 		}
@@ -281,7 +284,7 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 				Area:       this.GetString("area"),
 				ScopeClass: this.GetString("scopeClass"),
 				TimeRange:  this.GetString("timeRange"),
-				HasPower:   hasPower,
+				HasPower:   power > 0,
 			},
 			PageNum:  pageNum,
 			PageSize: pageSize,
@@ -347,11 +350,14 @@ func (this *SubVipPortrait) BuyerPortrait() {
 			Area:       this.GetString("area"),
 			ScopeClass: this.GetString("scopeClass"),
 			TimeRange:  this.GetString("timeRange"),
-			HasPower:   power,
+			HasPower:   power > 0,
 		}, flag)
 		if err != nil {
 			return nil, err
 		}
+		if power == 3 {
+			rData["onTrial"] = true
+		}
 		return rData, nil
 	}()
 	if errMsg != nil {