Merge branch 'dev/v4.8.29_ws' of http://192.168.3.207:8080/qmx/jy into dev/v4.8.29_ws

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

@@ -147,6 +147,41 @@ func CreateSubVipPortraitManager(userid string, pageFlag, searchValue string, is
 	return &Portrait{userid, session}, 1, nil, true
 }
 
+// CreateSubVipPortraitManagerForOpen 超级订阅权限校验-部分开放接口 int -1无权限 1免费权限 2超级订阅次数&采购单位流量包 3使用体验
+func CreateSubVipPortraitManagerForOpen(userid string, pageFlag, searchValue string, isWinner bool, session *httpsession.Session) (*Portrait, int, error, bool) {
+	if pageFlag == "" {
+		return nil, -1, errors.New("未知请求"), true
+	}
+	if pageFlag != "entDetail" { //需要权限校验的接口
+		if userid == "" {
+			// 未登录用户
+			return &Portrait{userid, session}, 1, nil, true
+		}
+		bigMsg := jy.GetBigVipUserBaseMsg(session, *config.Middleground)
+		if bigMsg.VipStatus <= 0 || bigMsg.Vip_BuySet.Upgrade != 1 { //免费用户留资体验
+			if searchValue != "" && jy.Portraitexperience(userid, searchValue, isWinner) {
+				return &Portrait{userid, session}, 3, nil, true
+			}
+			return &Portrait{userid, session}, -1, nil, true
+		} else { //超级订阅升级版-校验超级订阅画像浏览次数
+			//免费用户判断
+			free := false
+			if bigMsg.VipStatus <= 0 && bigMsg.Status <= 0 && !bigMsg.EntIsNew {
+				free = true
+			}
+			err := bigMsg.NewSubVipPortrait(db.Mysql, searchValue, isWinner).SubVipPortraitTimesCheck()
+			if err == nil {
+				return &Portrait{userid, session}, 2, nil, free
+			} else {
+				log.Printf("用户%s 超级订阅使用画像%s次数异常 %v\n", userid, searchValue, err)
+			}
+		}
+
+	}
+
+	return &Portrait{userid, session}, 1, nil, true
+}
+
 // GetEntInfo 获取企业基本信息
 func (this *Portrait) GetEntInfo(entId string) (map[string]interface{}, error) {
 	if entId == "" {

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

@@ -311,7 +311,7 @@ func (this *SubVipPortrait) BuyerSelects() {
 		if buyer == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		_, _, err, _ := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyer, false, this.Session())
+		_, _, err, _ := entity.CreateSubVipPortraitManagerForOpen(userId, "buyerPortrait", buyer, false, this.Session())
 		if err != nil {
 			return nil, err
 		}
@@ -334,7 +334,7 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 		}
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
-		cepm, power, err, _ := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyer, false, this.Session())
+		cepm, power, err, _ := entity.CreateSubVipPortraitManagerForOpen(userId, "buyerPortrait", buyer, false, this.Session())
 		if err != nil {
 			return nil, err
 		}
@@ -451,7 +451,7 @@ func (this *SubVipPortrait) BuyerPortrait() {
 		if buyerName == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		cepm, power, err, _ := entity.CreateSubVipPortraitManager(userId, "buyerPortrait", buyerName, false, this.Session())
+		cepm, power, err, _ := entity.CreateSubVipPortraitManagerForOpen(userId, "buyerPortrait", buyerName, false, this.Session())
 		cepm.Session = this.Session()
 		if err != nil {
 			return nil, err