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

controllers/activity.go

@@ -1184,6 +1184,9 @@ func (this *ActivityController) SignupAdd() {
 			} else {
 				go services.ActivityUserRemind(user, activityInfo, 4)
 				resp.PopupMsg = "<b>报名成功，已加入您的活动日程</b><br/><br/>想要及时获取活动信息变更通知，请关注【查研观向小助手】公众号"
+				if activityInfo.IsZoom == 1 && activityInfo.IsLimitPeople > 0 {
+					resp.PopupMsg = "<b>报名成功，已加入您的活动日程</b><br/><b>届时请通过zoom会议链接或app自主入会</b><br/><br/>想要及时获取活动信息变更通知，请关注【查研观向小助手】公众号"
+				}
 			}
 
 			if activityInfo.IsResearchPoints {
@@ -2394,8 +2397,10 @@ func (this *ActivityController) ScheduleList() {
 		}
 		v.SignupType = mapActivitySignup[v.ActivityId]
 		//处理列表的标签是否展示逻辑
-		resp.List = append(resp.List, services.ActivityButtonShow(v, user, make([]string, 0)))
+		//resp.List = append(resp.List, services.ActivityButtonShow(v, user, make([]string, 0)))
 	}
+
+	resp.List = services.ActivityArrButtonShow(list, user, make([]string, 0))
 	resp.Paging = page
 	br.Ret = 200
 	br.Success = true

models/activity.go

@@ -155,6 +155,8 @@ type ActivityDetail struct {
 	CancelDeadline            string                     `description:"取消报名截止时间"`
 	ChartPermissionNameDeputy string                     `description:"副行业名称"`
 	TopTime                   int                        `description:"置顶时间"`
+	IsZoom                    int                        `description:"是否是Zoom模版  1是，0否"`
+	MeetingId                 string                     `description:"会议ID"`
 }
 
 // 活动详情
@@ -235,6 +237,8 @@ type ActivityListResp struct {
 	IsYidongActivity        bool                       `description:"是否属于易董同步过来的活动"`
 	TopTime                 int                        `description:"置顶时间"`
 	ShareImg                string                     `description:"分享图片"`
+	IsZoom                  int                        `description:"是否是Zoom模版  1是，0否"`
+	MeetingId               string                     `description:"会议ID"`
 }
 
 type ActivityCheck struct {
@@ -579,6 +583,7 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			art.is_can_outbound_call,
 			art.is_research_points,
 			art.cancel_deadline,
+			art.is_zoom,
 			art.host 
 		FROM
 			cygx_activity AS art
@@ -617,6 +622,7 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			"",
 			"",
 			"",
+			"",
 			art.host 
 		FROM
 			cygx_activity_special AS art

services/activity.go

@@ -699,6 +699,13 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 					activityDetail.IsShowMeetingReminder = true
 					activityDetail.IsShowOutboundCall = true
 				}
+				if activityDetail.IsZoom == 1 {
+					activityDetail.IsShowMeetingReminder = true
+					if activityDetail.LimitPeopleNum == 0 {
+						activityDetail.IsShowOutboundCall = false
+					}
+				}
+
 			}
 
 			//公司线下调研 4
@@ -822,6 +829,8 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 		IsExternalLabel:         v.IsExternalLabel,
 		SiginupDeadline:         v.SiginupDeadline,
 		CancelDeadline:          v.CancelDeadline,
+		IsZoom:                  v.IsZoom,
+		MeetingId:               v.MeetingId,
 	}
 	au := new(models.UserPermissionAuthInfo)
 	au.SellerName = authInfo.SellerName
@@ -979,6 +988,13 @@ func ActivityArrButtonShow(items []*models.ActivityDetail, user *models.WxUserIt
 						activityDetail.IsShowMeetingReminder = true
 						activityDetail.IsShowOutboundCall = true
 					}
+
+					if activityDetail.IsZoom == 1 {
+						activityDetail.IsShowMeetingReminder = true
+						if activityDetail.LimitPeopleNum == 0 {
+							activityDetail.IsShowOutboundCall = false
+						}
+					}
 				}
 
 				//公司线下调研 4
@@ -1089,7 +1105,10 @@ func ActivityArrButtonShow(items []*models.ActivityDetail, user *models.WxUserIt
 			CancelDeadline:          v.CancelDeadline,
 			IsYidongActivity:        v.IsYidongActivity,
 			TopTime:                 v.TopTime,
+			IsZoom:                  v.IsZoom,
+			MeetingId:               v.MeetingId,
 		}
+
 		au := new(models.UserPermissionAuthInfo)
 		au.SellerName = authInfo.SellerName
 		au.SellerMobile = authInfo.SellerMobile