Merge branch 'cygx/cygx_14.1' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/cygx/activity.go

@@ -471,6 +471,7 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 			item.IsShowHz = isShowHz
 			item.ChartPermissionIdDeputy = charInfo.ChartPermissionId
 			item.ChartPermissionNameDeputy = charInfo.PermissionName
+			item.IsZoom = req.IsZoom
 			if len(labelList) == 1 {
 				item.IsCanAppointmentMinutes = labelList[0].IsCanAppointmentMinutes
 			} else {

models/cygx/activity.go

@@ -93,6 +93,7 @@ type ActivityRep struct {
 	BackgroundImg           string                       `description:"封面图片"`
 	ShareImg                string                       `description:"分享图片"`
 	AreaType                int                          `description:"地区，1国内，2海外，默认1"`
+	IsZoom                  int                          `description:"是否是Zoom模版  1是，0否"`
 }
 
 // 活动添加、修改入参
@@ -180,6 +181,7 @@ type ActivityDetail struct {
 	ShareImg                  string                     `description:"分享图片"`
 	TopTime                   int                        `description:"置顶时间"`
 	AreaType                  int                        `description:"地区，1国内，2海外，默认1"`
+	IsZoom                    int                        `description:"是否是Zoom模版  1是，0否"`
 }
 
 type ActivityDetailRep struct {
@@ -253,6 +255,8 @@ type CygxActivity struct {
 	ChartPermissionNameDeputy string    `description:"行业名称"`
 	CancelDeadline            string    `description:"取消报名截止时间"`
 	AreaType                  int       `description:"地区，1国内，2海外，默认1"`
+	IsZoom                    int       `description:"是否是Zoom模版  1是，0否"`
+	MeetingId                 string    `description:"会议ID"`
 }
 
 type CygxActivityEditDetail struct {
@@ -426,6 +430,8 @@ func EditActivity(item *CygxActivity, oldPublishStatus int, industrialActivityIt
 	updateParams["ChartPermissionIdDeputy"] = item.ChartPermissionIdDeputy
 	updateParams["CancelDeadline"] = item.CancelDeadline
 	updateParams["AreaType"] = item.AreaType
+	updateParams["MeetingId"] = item.MeetingId
+	updateParams["IsZoom"] = item.IsZoom
 	//修改活动信息
 	ptrStructOrTableName := "cygx_activity"
 	whereParam := map[string]interface{}{"activity_id": item.ActivityId}

services/cygx/acitvity.go

@@ -690,6 +690,9 @@ func ActivityBodyAnalysis(body string, activeState int, req cygx.ActivityRep) (i
 		if strings.Contains(contentTxt, "腾讯会议号：") {
 			item.TencentConferenceNumber = strings.Replace(contentTxt, "腾讯会议号：", "", -1)
 		}
+		if strings.Contains(contentTxt, "会议ID：") {
+			item.MeetingId = strings.Replace(contentTxt, "会议ID：", "", -1)
+		}
 	})
 
 	strnum := strings.Index(body, "活动亮点：")