Browse Source

no message

xingzai 2 years ago
parent
commit
fd637d7be7
4 changed files with 16 additions and 0 deletions
  1. 1 0
      controllers/activity.go
  2. 10 0
      models/activity.go
  3. 3 0
      models/resource_data.go
  4. 2 0
      services/activity.go

+ 1 - 0
controllers/activity.go

@@ -1695,6 +1695,7 @@ func (this *ActivityController) ActivityListSearch() {
 		item.ActiveState = v.ActiveState
 		item.PublishDate = v.ActivityTime
 		item.FileType = v.FileType
+		item.IsYidongConduct = v.IsYidongConduct
 		if v.VoiceList != nil || v.VideoDetail != nil {
 			item.AudioLink = true
 			if v.FileType == 1 {

+ 10 - 0
models/activity.go

@@ -141,6 +141,9 @@ type ActivityDetail struct {
 	AuthInfo                *UserPermissionAuthInfo    `description:"用户查看视频的权限"`
 	Days                    int                        `description:"调研天数"`
 	Title                   string                     `description:"标题"`
+	IsYidongConduct         bool                       `description:"是否属于易董办会 1:是 、0:否"`
+	IsCanOutboundCall       int                        `description:"是否提供外呼 1:是 、0:否"`
+	TencentConferenceNumber string                     `description:"腾讯会议号"`
 }
 
 // 活动详情
@@ -207,6 +210,9 @@ type ActivityListResp struct {
 	TripStatus              int                        `description:"行程进行状态 1:预报名,2:确定行程"`
 	Days                    int                        `description:"调研天数"`
 	SignupType              int                        `description:"报名方式,1预约外呼,2自主拨入,3我要报名"`
+	IsYidongConduct         bool                       `description:"是否属于易董办会 1:是 、0:否"`
+	IsCanOutboundCall       int                        `description:"是否提供外呼 1:是 、0:否"`
+	TencentConferenceNumber string                     `description:"腾讯会议号"`
 }
 
 type ActivityArticleResp struct {
@@ -383,6 +389,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			art.limit_people_num,
 			1 AS source_type,
             t.img_url_text,
+            art.is_yidong_conduct,
 			art.activity_time 
 		FROM
 			cygx_activity AS art
@@ -412,6 +419,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			"",
 			2 AS source_type,
 			"",
+			"",
 			art.activity_time 
 		FROM
 			cygx_activity_special AS art
@@ -504,6 +512,7 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			art.activity_time,
 			0 AS days,
 			art.city AS city,
+			art.is_yidong_conduct,
 			art.host 
 		FROM
 			cygx_activity AS art
@@ -537,6 +546,7 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			art.activity_time,
 			art.days,
 			art.city,
+			"",
 			art.host 
 		FROM
 			cygx_activity_special AS art

+ 3 - 0
models/resource_data.go

@@ -63,6 +63,9 @@ type CygxResourceDataResp struct {
 	FileType                int                        `description:"类型: 1-音频; 2-视频"`
 	SignupType              int                        `description:"报名方式,1预约外呼,2自主拨入,3我要报名"`
 	ActivityTypeId          int                        `description:"活动类型id"`
+	IsYidongConduct         bool                       `description:"是否属于易董办会 1:是 、0:否"`
+	IsCanOutboundCall       int                        `description:"是否提供外呼 1:是 、0:否"`
+	TencentConferenceNumber string                     `description:"腾讯会议号"`
 }
 
 type HomeResourceDataListResp struct {

+ 2 - 0
services/activity.go

@@ -546,6 +546,8 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem) (i
 		TripImgLink:             v.TripImgLink,
 		Days:                    v.Days,
 		SignupType:              v.SignupType,
+		IsYidongConduct:         v.IsYidongConduct,
+		TencentConferenceNumber: v.TencentConferenceNumber,
 	}
 	au := new(models.UserPermissionAuthInfo)
 	au.SellerName = authInfo.SellerName