Merge branch 'mfyx_3.6' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

controllers/article.go

@@ -138,7 +138,7 @@ func (this *ArticleController) Detail() {
 		}
 	}
 
-	havePower, err := services.GetArticleDetailUserPower(user, detail)
+	havePower, err := services.GetArticleDetailUserPower(user)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "校验用户权限失败，Err:" + err.Error()
@@ -506,19 +506,10 @@ func (this *ArticleController) AddStopTime() {
 		source = "MOBILE"
 	}
 
-	detail := new(models.ArticleDetail)
 	hasPermission := 0
 	hasFree := 0
 
-	//resp := new(models.ArticleDetailResp)
-	detail, err = models.GetArticleDetailById(articleId)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取信息失败,Err:" + err.Error()
-		return
-	}
-
-	havePower, err := services.GetArticleDetailUserPower(user, detail)
+	havePower, err := services.GetArticleDetailUserPower(user)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "校验用户权限失败，Err:" + err.Error()
@@ -537,85 +528,6 @@ func (this *ArticleController) AddStopTime() {
 		}
 	}
 
-	//	//判断是否已经申请过
-	//	applyCount, err := models.GetApplyRecordCount(uid)
-	//	if err != nil && err.Error() != utils.ErrNoRow() {
-	//		br.Msg = "获取信息失败"
-	//		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
-	//		return
-	//	}
-	//	//`description:"1:有该行业权限,正常展示，2：无该行业权限，不存在权益客户下，3:无该品类权限，4：潜在客户，未提交过申请，5：潜在客户,已提交过申请"`
-	//	if user.CompanyId > 1 {
-	//		companyPermission, err := models.GetCompanyPermission(user.CompanyId)
-	//		if err != nil {
-	//			br.Msg = "获取信息失败"
-	//			br.ErrMsg = "判断是否已申请访谈失败，Err:" + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
-	//			return
-	//		}
-	//		detail, err = models.GetArticleDetailById(articleId)
-	//		if err != nil {
-	//			br.Msg = "获取信息失败"
-	//			br.ErrMsg = "获取文章信息失败,Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
-	//			return
-	//		}
-	//		if companyPermission == "" {
-	//			if applyCount > 0 {
-	//				hasPermission = 5
-	//			} else {
-	//				hasPermission = 2
-	//			}
-	//			hasFree = 2
-	//			goto Loop
-	//		} else {
-	//			hasFree = 1
-	//			var articlePermissionPermissionName string
-	//			if detail.CategoryId > 0 {
-	//				articlePermission, err := models.GetArticlePermission(detail.CategoryId)
-	//				if err != nil {
-	//					br.Msg = "获取信息失败"
-	//					br.ErrMsg = "获取报告权限失败，Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
-	//					return
-	//				}
-	//				if articlePermission == nil {
-	//					br.Msg = "获取信息失败"
-	//					br.ErrMsg = "报告权限不存在，Err:" + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
-	//					return
-	//				}
-	//				articlePermissionPermissionName = articlePermission.PermissionName
-	//			} else {
-	//				articlePermissionPermissionName = detail.CategoryName
-	//			}
-	//			var hasPersion bool
-	//			slice := strings.Split(articlePermissionPermissionName, ",")
-	//			//判断用户是否开通了个人研选权限，如果有权限后缀拼接权限名称
-	//			mfyxUserPermissionTotal := services.GetMfyxUserPermissionTotal(uid)
-	//			if mfyxUserPermissionTotal == 1 {
-	//				companyPermission += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
-	//				companyPermission += "," + utils.MAI_FANG_YAN_XUAN_NAME
-	//			}
-	//			//如果有研选订阅的权限，那么就拼接一个 买方研选的权限做校验
-	//			if strings.Contains(companyPermission, utils.CHART_PERMISSION_NAME_MF_YANXUAN) {
-	//				companyPermission += "," + utils.MAI_FANG_YAN_XUAN_NAME
-	//			}
-	//			for _, v := range slice {
-	//				if strings.Contains(companyPermission, v) {
-	//					hasPersion = true
-	//				}
-	//			}
-	//			if hasPersion {
-	//				go services.ArticleHistoryStopTime(articleId, stopTime, outType, user)
-	//			} else { //无该行业权限
-	//				hasPermission = 3
-	//			}
-	//		}
-	//	} else { //潜在客户
-	//		if applyCount > 0 {
-	//			hasPermission = 5
-	//		} else {
-	//			hasPermission = 4
-	//		}
-	//	}
-	//Loop:
 	resp := new(models.ArticleDetailAddStopTimeRep)
 	resp.HasPermission = hasPermission
 	resp.HasFree = hasFree

services/article.go

@@ -572,7 +572,7 @@ func GetYanxuanArticleIds() (articleIds []int) {
 }
 
 // GetArticleDetailUserPower 处理用户查看报告详情的权限
-func GetArticleDetailUserPower(user *models.WxUserItem, articleInfo *models.ArticleDetail) (havePower bool, err error) {
+func GetArticleDetailUserPower(user *models.WxUserItem) (havePower bool, err error) {
 	userId := user.UserId
 	companyId := user.CompanyId
 	//判断用户是否开通了个人研选权限

services/order.go

@@ -191,7 +191,12 @@ func GetActivityVivoPoints(item *models.ActivityDetail, wxUser *models.WxUserIte
 	}
 	vivoPointsResp.CompanyPoints = fmt.Sprint(companyPointsNum)
 
-	if havePower {
+	havePowerYx, e := GetArticleDetailUserPower(wxUser)
+	if e != nil {
+		err = errors.New("GetArticleDetailUserPower, Err: " + e.Error())
+		return
+	}
+	if havePower || havePowerYx {
 		if vivoPointsSetDetail.PointsNum == 0 { //有权限情况下，点数为零的时候直接播放
 			vivoPointsResp.HavePoint = true
 		}