no message

controllers/activity.go

@@ -2636,3 +2636,91 @@ func (this *ActivityController) GetYidongUrl() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// @Title 校验活动带问是否有权限
+// @Description 校验活动带问是否有权限接口
+// @Param	request	body models.ActivityIdRep true "type json string"
+// @Success Ret=200 {object} models.SignupStatus
+// @router /checkAsk [post]
+func (this *ActivityController) CheckAsk() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	user := this.User
+	if user == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，用户信息为空"
+		br.Ret = 408
+		return
+	}
+	var signupStatus string
+	var req models.ActivityIdRep
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	activityId := req.ActivityId
+	activityInfo, errInfo := models.GetAddActivityInfoById(activityId)
+	if activityInfo == nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "活动ID错误,不存在activityId：" + strconv.Itoa(activityId)
+		return
+	}
+	if errInfo != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + errInfo.Error()
+		return
+	}
+	resp := new(models.SignupStatus)
+	hasPermission := 0
+	havePower, isResearchSpecial, err := services.GetActivityDetailUserPower(user, activityInfo)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "校验用户权限失败，Err:" + err.Error()
+		return
+	}
+	resp.IsResearchSpecial = isResearchSpecial
+	if havePower {
+		hasPermission = 1
+		signupStatus = "Success"
+		//限制人数为1人的专家电话会 用户操作时的消息提示
+		if activityInfo.LimitPeopleNum == 1 && activityInfo.ActivityTypeId == 1 {
+			resp.HasPermission = hasPermission
+			resp.SignupStatus = utils.FULLSTARFFED_MSG
+			resp.PopupMsg = utils.ACTIVITY_ZJDHH_V1_MSG
+			br.Ret = 200
+			br.Success = true
+			br.Msg = ""
+			br.Data = resp
+			return
+		}
+		resp.HaqveJurisdiction = true
+		resp.HasPermission = hasPermission
+		resp.SignupStatus = signupStatus
+	} else {
+		hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermission(user)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
+			return
+		}
+		popupMsg = "暂无查看权限"
+		resp.PopupMsg = popupMsg
+		resp.HasPermission = hasPermission
+		resp.SellerName = sellerName
+		resp.SellerMobile = sellerMobile
+	}
+	// 判断是否属于研选类型的活动
+	if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
+		resp.IsResearch = true
+	}
+
+	resp.ActivityId = activityId
+	br.Ret = 200
+	br.Success = true
+	br.Data = resp
+}

controllers/home.go

@@ -214,6 +214,13 @@ func (this *MobileHomeController) List() {
 			br.ErrMsg = "获取报告封面图片失败, Err:" + err.Error()
 			return
 		}
+		var articleIds []int
+		for _, v := range listPublic {
+			articleIds = append(articleIds, v.ArticleId)
+		}
+		articleMapPv := services.GetArticleHistoryByArticleId(articleIds)                       //文章Pv
+		articleCollectMap, _ := services.GetCygxArticleCollectMap(user.UserId)                  //用户收藏的文章
+		articleCollectNumMap, _ := services.GetCygxArticleCollectNumMapByArtcileIds(articleIds) //文章收藏的数量
 		var list []*models.HomeArticle
 		if len(listPublic) == 0 {
 			list = make([]*models.HomeArticle, 0)
@@ -227,6 +234,9 @@ func (this *MobileHomeController) List() {
 					ImgUrlPc:    v.ImgUrlPc,
 					PublishDate: v.PublishDate,
 					IsResearch:  v.IsResearch,
+					Pv:          articleMapPv[v.ArticleId],
+					IsCollect:   articleCollectMap[v.ArticleId],
+					CollectNum:  articleCollectNumMap[v.ArticleId],
 				})
 			}
 		}

controllers/report_billboard.go

@@ -132,6 +132,7 @@ func (this *MobileReportBillboardController) ReadList() {
 			list = collectList
 		}
 	}
+
 	var err error
 	resp := new(models.ReportBillboardListResp)
 	resp.List, err = services.HandleArticleCategoryImg(list, user)

routers/commentsRouter.go

@@ -43,6 +43,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:ActivityController"] = append(beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:ActivityController"],
+        beego.ControllerComments{
+            Method: "CheckAsk",
+            Router: `/checkAsk`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:ActivityController"] = append(beego.GlobalControllerRouter["hongze/hongze_clpt/controllers:ActivityController"],
         beego.ControllerComments{
             Method: "Detail",

services/article.go

@@ -190,12 +190,20 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp, user *models.WxUse
 			})
 		}
 	}
-	// 处理文章收藏字段
-	mapCollect, e := GetUserAticleCollectMap(user)
-	if e != nil {
-		err = errors.New("GetUserAticleCollectMap" + e.Error())
-		return
-	}
+	//// 处理文章收藏字段
+	//mapCollect, e := GetUserAticleCollectMap(user)
+	//if e != nil {
+	//	err = errors.New("GetUserAticleCollectMap" + e.Error())
+	//	return
+	//}
+
+	//var articleIds []int
+	//for _, v := range list {
+	//	articleIds = append(articleIds, v.ArticleId)
+	//}
+	articleMapPv := GetArticleHistoryByArticleId(articleIds)                       //文章Pv
+	articleCollectMap, _ := GetCygxArticleCollectMap(user.UserId)                  //用户收藏的文章
+	articleCollectNumMap, _ := GetCygxArticleCollectNumMapByArtcileIds(articleIds) //文章收藏的数量
 
 	for k, v := range list {
 		if len(industryMap[v.ArticleId]) > 0 {
@@ -203,9 +211,12 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp, user *models.WxUse
 		} else {
 			list[k].List = make([]*models.IndustrialManagementIdInt, 0)
 		}
-		if _, ok := mapCollect[v.ArticleId]; ok {
-			list[k].IsCollect = true
-		}
+		//if _, ok := mapCollect[v.ArticleId]; ok {
+		//	list[k].IsCollect = true
+		//}
+		list[k].Pv = articleMapPv[v.ArticleId]
+		list[k].IsCollect = articleCollectMap[v.ArticleId]
+		list[k].CollectNum = articleCollectNumMap[v.ArticleId]
 	}
 
 	if len(list) == 0 {