采购画像次数使用完后仍可以查看免费部分

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

@@ -53,9 +53,9 @@ func CreateSubVipPortraitManager(userid string, pageFlag, searchValue string, is
 			if searchValue != "" && jy.Portraitexperience(userid, searchValue, isWinner) {
 				return &Portrait{userid}, 3, nil
 			}
-			if !(pageFlag == "buyerPortraitNotCheckPower" || pageFlag == "buyerPortrait_newMsg" || pageFlag == "buyerPortrait_select") {
-				return nil, -1, errors.New("非法请求")
-			}
+			//if !(pageFlag == "buyerPortraitNotCheckPower" || pageFlag == "buyerPortrait_newMsg" || pageFlag == "buyerPortrait_select") {
+			//	return nil, -1, errors.New("非法请求")
+			//}
 			return nil, -1, nil
 		} else { //超级订阅升级版-校验超级订阅画像浏览次数
 			if err := bigMsg.SubVipPortraitTimesCheck(db.Mysql, searchValue, isWinner); err != nil {

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

@@ -4,6 +4,7 @@ import (
 	. "api"
 	"db"
 	"entity"
+	"errors"
 	"fmt"
 	"github.com/go-xweb/xweb"
 	"log"
@@ -18,12 +19,13 @@ import (
 //超级订阅升级版画像接口
 type SubVipPortrait struct {
 	*xweb.Action
+	portraitUsage  xweb.Mapper `xweb:"/portrait/subVipPortrait/usage"`  //超级订阅升级版画像浏览详情
+	portraitRecord xweb.Mapper `xweb:"/portrait/subVipPortrait/record"` //超级订阅升级版画像浏览记录
+
 	subVipEntDetail     xweb.Mapper `xweb:"/portrait/subVipPortrait/entDetail"`    //企业基本信息
 	subVipPortrait      xweb.Mapper `xweb:"/portrait/subVipPortrait/winner"`       //超级订阅升级版查看画像
 	subVipWinnerNewMsg  xweb.Mapper `xweb:"/portrait/subVipPortrait/winnerNewMsg"` //超级订阅升级版查看最新项目动态
 	subVipNewMsgSelects xweb.Mapper `xweb:"/portrait/subVipPortrait/selects"`      //最新招标信息可筛选项
-	portraitUsage       xweb.Mapper `xweb:"/portrait/subVipPortrait/usage"`        //超级订阅升级版画像浏览详情
-	portraitRecord      xweb.Mapper `xweb:"/portrait/subVipPortrait/record"`       //超级订阅升级版画像浏览记录
 
 	buyerContacts xweb.Mapper `xweb:"/subVipPortrait/buyer/contacts"`  //采购项目联系方式
 	buyerSelects  xweb.Mapper `xweb:"/subVipPortrait/buyer/selects"`   //采购单位画像可筛选项
@@ -43,7 +45,6 @@ func (this *SubVipPortrait) SubVipEntDetail() {
 		if err != nil {
 			return nil, err
 		}
-
 		entInfo, err := cepm.GetEntInfo(entId)
 		if err != nil {
 			return nil, err
@@ -64,10 +65,13 @@ func (this *SubVipPortrait) SubVipWinnerNewMsg() {
 		if entId == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		cepm, _, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
 		if err != nil {
 			return nil, err
 		}
+		if power <= 0 {
+			return nil, errors.New("非法请求")
+		}
 
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
@@ -108,10 +112,13 @@ func (this *SubVipPortrait) SubVipNewMsgSelects() {
 		if entId == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		_, _, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
+		_, power, err := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true)
 		if err != nil {
 			return nil, err
 		}
+		if power <= 0 {
+			return nil, errors.New("非法请求")
+		}
 		pwp := &entity.PortraitScreen{Ent: entId}
 		return pwp.GetProjectSelectItems(true)
 	}()
@@ -249,7 +256,7 @@ func (this *SubVipPortrait) BuyerSelects() {
 		if buyer == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		_, _, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait_select", buyer, false)
+		_, _, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyer, false)
 		if err != nil {
 			return nil, err
 		}
@@ -272,7 +279,7 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 		}
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
-		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait_newMsg", buyer, false)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyer, false)
 		if err != nil {
 			return nil, err
 		}
@@ -313,10 +320,13 @@ func (this *SubVipPortrait) BuyerContacts() {
 		if buyerName == "" {
 			return nil, fmt.Errorf("企业参数异常")
 		}
-		cepm, _, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyerName, false)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyerName, false)
 		if err != nil {
 			return nil, err
 		}
+		if power <= 0 {
+			return nil, errors.New("非法请求")
+		}
 		rData, err := cepm.GetBuyerContactsMsg(buyerName)
 		if err != nil {
 			return nil, err
@@ -339,7 +349,7 @@ func (this *SubVipPortrait) BuyerPortrait() {
 		if buyerName == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortraitNotCheckPower", buyerName, false)
+		cepm, power, err := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyerName, false)
 		if err != nil {
 			return nil, err
 		}