Browse Source

活动列表加入易董跳转链接

xingzai 2 năm trước cách đây
mục cha
commit
b4fb2a11f8
3 tập tin đã thay đổi với 14 bổ sung5 xóa
  1. 2 2
      controllers/activity.go
  2. 11 2
      services/activity.go
  3. 1 1
      services/resource_data.go

+ 2 - 2
controllers/activity.go

@@ -310,7 +310,7 @@ func (this *ActivityController) ActivityListNew() {
 			list[k].VideoDetail = mapActivityVideo[v.ActivityId]
 		}
 		//fmt.Println(v)
-		activityList = append(activityList, services.ActivityButtonShow(v))
+		activityList = append(activityList, services.ActivityButtonShow(v, user))
 	}
 
 	// 查研观向7.4-判断标签是否为产业, 为产业时是否跳转资源包
@@ -413,7 +413,7 @@ func (this *ActivityController) Detail() {
 	}
 	if havePower {
 		resp.HasPermission = 1
-		detailResp := services.ActivityButtonShow(activityInfo)
+		detailResp := services.ActivityButtonShow(activityInfo, user)
 		detailResp, err = services.ActivityDetaailShow(detailResp)
 		if err != nil {
 			br.Msg = "获取信息失败"

+ 11 - 2
services/activity.go

@@ -348,7 +348,7 @@ func GetActivityVideoResp(mapActivityId []int) (mapItem map[int]*models.CygxActi
 	return
 }
 
-func ActivityButtonShow(item *models.ActivityDetail) (itemActivity *models.ActivityListResp) {
+func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem) (itemActivity *models.ActivityListResp) {
 	articleDetail := item
 	//IsShowAppointment       bool                       `description:"是否展示预约纪要"`
 	//IsShowOutboundCall      bool                       `description:"是否展示预约外呼"`
@@ -360,12 +360,20 @@ func ActivityButtonShow(item *models.ActivityDetail) (itemActivity *models.Activ
 	activityTimeText = strings.Replace(activityTimeText, "(", "(", -1)
 	activityTimeText = strings.Replace(activityTimeText, ")", ")", -1)
 	articleDetail.ActivityTimeText = activityTimeText
-
+	var yidongActivityUrl string
 	articleDetail.IsShowAppointment = false
 	//易董的操作按钮都隐藏
 	if articleDetail.YidongActivityId != "" {
 		articleDetail.IsShowSignup = false
 		articleDetail.IsShowDetails = true
+
+		if articleDetail.YidongActivityId != "" {
+			ydTgc, _ := GetYiDongCreateUserInfo(user)
+			yidongLongLink, _ := GetYiDongOriginalLink(articleDetail)
+			if yidongLongLink != "" {
+				yidongActivityUrl = yidongLongLink + "%26source=11%26fromHz=true%26tgc=" + ydTgc
+			}
+		}
 	} else {
 
 		//专家电话会 1
@@ -478,6 +486,7 @@ func ActivityButtonShow(item *models.ActivityDetail) (itemActivity *models.Activ
 		VideoDetail:             v.VideoDetail,
 		FileType:                v.FileType,
 		SourceType:              v.SourceType,
+		YidongActivityUrl:       yidongActivityUrl,
 	}
 	return
 }

+ 1 - 1
services/resource_data.go

@@ -106,7 +106,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		var activityListRersp []*models.ActivityListResp
 		for _, v := range activityList {
 
-			activityListRersp = append(activityListRersp, ActivityButtonShow(v))
+			activityListRersp = append(activityListRersp, ActivityButtonShow(v, user))
 		}
 		for _, v := range activityListRersp {
 			if v == nil {