Merge branch 'cygx_12.6' of http://8.136.199.33:3000/hongze/hongze_cygx

controllers/activity.go

@@ -609,7 +609,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
 	signupStatus := ""
 	var req models.ActivitySingnupRep
 	resp := new(models.SignupStatus)
-	var total int
+	//var total int
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
@@ -637,6 +637,12 @@ func (this *ActivityCoAntroller) SignupAdd() {
 		br.ErrMsg = "操作失败,Err:" + errInfo.Error()
 		return
 	}
+	detailActivityType, err := models.GetActivityTypeDetailById(activityInfo.ActivityTypeId)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取信息失败,GetActivityTypeDetailById Err:" + err.Error()
+		return
+	}
 	// 如果是 易董办会 且没有勾选 可提供外呼 默认为自主入会
 	if activityInfo.IsYidongConduct && activityInfo.IsCanOutboundCall == 0 {
 		signupType = 4
@@ -762,15 +768,15 @@ func (this *ActivityCoAntroller) SignupAdd() {
 				resp.SignupStatus = "Success"
 				resp.HasPermission = hasPermission
 				resp.ActivityId = activityId
-				total, err = models.GetUserMeetingReminderCount(user.UserId)
-				if err != nil {
-					br.Msg = "获取信息失败"
-					br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
-					return
-				}
-				if total == 0 {
-					resp.GoFollow = true
-				}
+				//total, err = models.GetUserMeetingReminderCount(user.UserId)
+				//if err != nil {
+				//	br.Msg = "获取信息失败"
+				//	br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
+				//	return
+				//}
+				//if total == 0 {
+				//	resp.GoFollow = true
+				//}
 				br.Ret = 200
 				br.Success = true
 				br.Msg = "操作成功"
@@ -869,13 +875,16 @@ func (this *ActivityCoAntroller) SignupAdd() {
 			//1：预约外呼 、2：设置会议提醒 、 3：预约纪要 、4：活动报名
 			if signupType == 1 {
 				go services.ActivityUserRemind(user, activityInfo, 1)
-				resp.PopupMsg = "<b>预约成功，已加入您的活动日程</b><br/><br/>想要及时获取活动信息变更通知，请关注【查研观向小助手】公众号"
+				//resp.PopupMsg = "<b>预约成功，已加入您的活动日程</b><br/><br/>想要及时获取活动信息变更通知，请关注【查研观向小助手】公众号"
+				resp.PopupMsg = "<b>预约成功，已加入您的活动日程</b><br/><br/>是否将活动日程加入您的系统日历，\n\n活动开始前获取手机日历提醒？"
 			} else if signupType == 4 {
 				go services.ActivityUserRemind(user, activityInfo, 4)
-				resp.PopupMsg = "<b>报名成功，请复制腾讯会议号打开腾讯会议app参会</b><br/>想要及时获取活动信息变更通知，请关注【查研观向小助手】公众号"
+				//resp.PopupMsg = "<b>报名成功，请复制腾讯会议号打开腾讯会议app参会</b><br/>想要及时获取活动信息变更通知，请关注【查研观向小助手】公众号"
+				resp.PopupMsg = "<b>报名成功，请复制腾讯会议号打开腾讯会议app参会</b><br/>是否将活动日程加入您的系统日历，\n\n活动开始前获取手机日历提醒？"
 			} else {
 				go services.ActivityUserRemind(user, activityInfo, 4)
-				resp.PopupMsg = "<b>报名成功，已加入您的活动日程</b><br/>想要及时获取活动信息变更通知，请关注【查研观向小助手】公众号"
+				//resp.PopupMsg = "<b>报名成功，已加入您的活动日程</b><br/>想要及时获取活动信息变更通知，请关注【查研观向小助手】公众号"
+				resp.PopupMsg = "<b>报名成功，已加入您的活动日程</b><br/>是否将活动日程加入您的系统日历，\n\n活动开始前获取手机日历提醒？"
 			}
 			go services.YanXuanActivityPointsBillSignupAdd(activityId, uid) // 用户报名添加到处理研选扣点
 		}
@@ -937,16 +946,21 @@ func (this *ActivityCoAntroller) SignupAdd() {
 	//resp.HasPermission = hasPermission
 	//if signupStatus == "Success" {
 	resp.ActivityId = activityId
+	resp.ActivityTypeName = activityInfo.ActivityName
+	resp.ActivityTime = activityInfo.ActivityTime
+	resp.ActivityType = detailActivityType.ActivityType
+	//}
+
+	//去关注12.6小程序添加日历 去关注公众号强制取消关注
+	//total, err = models.GetUserSignupCount(user.UserId)
+	//if err != nil {
+	//	br.Msg = "获取信息失败"
+	//	br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
+	//	return
+	//}
+	//if total <= 1 {
+	//	resp.GoFollow = true
 	//}
-	total, err = models.GetUserSignupCount(user.UserId)
-	if err != nil {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
-		return
-	}
-	if total <= 1 {
-		resp.GoFollow = true
-	}
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
@@ -1300,21 +1314,31 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 
 	resp.SignupStatus = signupStatus
 	resp.ActivityId = activityId
-	var total int
-	total, err = models.GetUserActivityMeetingReminderCount(user.UserId)
+	//var total int
+	//total, err = models.GetUserActivityMeetingReminderCount(user.UserId)
+	//if err != nil {
+	//	br.Msg = "获取信息失败"
+	//	br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
+	//	return
+	//}
+	//if total <= 1 {
+	//	resp.GoFollow = true
+	//}
+	detailActivityType, err := models.GetActivityTypeDetailById(activityInfo.ActivityTypeId)
 	if err != nil {
 		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
+		br.ErrMsg = "获取信息失败,GetActivityTypeDetailById Err:" + err.Error()
 		return
 	}
-	if total <= 1 {
-		resp.GoFollow = true
-	}
+	resp.ActivityTypeName = activityInfo.ActivityName
+	resp.ActivityTime = activityInfo.ActivityTime
+	resp.ActivityType = detailActivityType.ActivityType
 	br.Ret = 200
 	br.Success = true
 	if hasPermission == 1 {
 		br.Msg = "设置成功，会前15分钟会为您推送微信消息提醒"
-		resp.PopupMsg = "设置成功，会前15分钟会为您推送微信消息提醒<br/><br/>请关注【查研观向小助手】公众号，以获取微信消息提醒"
+		resp.PopupMsg = "设置成功，会前15分钟会为您推送微信消息提醒<br/><br/>是否将活动日程加入您的系统日历，\n\n活动开始前获取手机日历提醒？"
+		//resp.PopupMsg = "设置成功，会前15分钟会为您推送微信消息提醒<br/><br/>请关注【查研观向小助手】公众号，以获取微信消息提醒"
 	}
 	br.Data = resp
 }
@@ -3576,16 +3600,25 @@ func (this *ActivityCoAntroller) ActivityAppointmentAdd() {
 	}
 
 	resp.ActivityId = activityId
-	var total int
-	total, err = models.GetUserCygxActivityAppointmentCountByUid(user.UserId)
+	//var total int
+	//total, err = models.GetUserCygxActivityAppointmentCountByUid(user.UserId)
+	//if err != nil {
+	//	br.Msg = "获取信息失败"
+	//	br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
+	//	return
+	//}
+	//if total <= 1 {
+	//	resp.GoFollow = true
+	//}
+	detailActivityType, err := models.GetActivityTypeDetailById(activityInfo.ActivityTypeId)
 	if err != nil {
 		br.Msg = "获取信息失败"
-		br.ErrMsg = "获取日程数量信息失败,Err:" + err.Error()
+		br.ErrMsg = "获取信息失败,GetActivityTypeDetailById Err:" + err.Error()
 		return
 	}
-	if total <= 1 {
-		resp.GoFollow = true
-	}
+	resp.ActivityTypeName = activityInfo.ActivityName
+	resp.ActivityTime = activityInfo.ActivityTime
+	resp.ActivityType = detailActivityType.ActivityType
 	br.Ret = 200
 	br.Success = true
 	if hasPermission == 1 {

models/activity_signup.go

@@ -42,6 +42,9 @@ type SignupStatus struct {
 	GoBindEmail       bool   `description:"是否去绑定邮箱"`
 	IsResearch        bool   `description:"是否属于研选"`
 	IsResearchSpecial bool   `description:"是否属于特殊的研选"`
+	ActivityTypeName  string `description:"活动类型名称"`
+	ActivityTime      string `description:"活动时间"`
+	ActivityType      int    `description:"活动线上线下类型 1线上，0 线下"`
 }
 
 // 我的日程

models/activity_type.go

@@ -9,9 +9,10 @@ type ActivityType struct {
 	ActivityTypeName string `description:"活动类型名称"`
 	//TemplateP        string `description:"活动模板，带P标签"`
 	//Template         string `description:"活动模板"`
-	ShowType  string `description:"人数限制类型，1不展示限制，2可选限制，3强制限制"`
-	IsChoose  bool   `description:"是否选择"`
-	OnlineIco string `description:"线上线下Ico图标"`
+	ShowType     string `description:"人数限制类型，1不展示限制，2可选限制，3强制限制"`
+	IsChoose     bool   `description:"是否选择"`
+	OnlineIco    string `description:"线上线下Ico图标"`
+	ActivityType int    `description:"活动线上线下类型 1线上，0 线下"`
 }
 
 type ActivityTypeListResp struct {

services/activity.go

@@ -2248,8 +2248,9 @@ func ActivityButtonShow(item *models.ActivityDetail) (activityDetail *models.Act
 	//IsShowMeetingReminder   bool                       `description:"是否展示会议提醒"`
 	//IsShowHelpSsk           bool                       `description:"是否展示帮我带问"`
 	//IsShowSignup            bool                       `description:"是否展示我要报名"`
-
-	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
+	activityTypeIdMap := GetActivityTypeIdMap()
+	activityDetail.ActivityType = activityTypeIdMap[activityDetail.ActivityTypeId] // 线上还是线下
+	activityPointsByUserAllMap := GetActivityPointsByUserAllMap()                  // 获取对用户进行研选扣点的活动
 	activityDetail.IsResearchPoints = activityPointsByUserAllMap[activityDetail.ActivityId]
 	if activityDetail.SiginupDeadline == utils.FormatDateTimeInit { //报名截止时间处理
 		activityDetail.SiginupDeadline = ""
@@ -2363,7 +2364,9 @@ func ActivityButtonShow(item *models.ActivityDetail) (activityDetail *models.Act
 
 func ActivityArrButtonShow(items []*models.ActivityDetail) (activityDetails []*models.ActivityDetail) {
 	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
+	activityTypeIdMap := GetActivityTypeIdMap()
 	for _, activityDetail := range items {
+		activityDetail.ActivityType = activityTypeIdMap[activityDetail.ActivityTypeId] // 线上还是线下
 		if activityDetail.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
 			activityDetail.IsResearch = true
 		}
@@ -2774,3 +2777,24 @@ func UpdateIsSendYidongSignUp(activityId int) (err error) {
 	err = models.UPdateSendedYiDongSignUp(activityId)
 	return
 }
+
+// 获取活动线上还是线下的类型
+func GetActivityTypeIdMap() (mapResp map[int]int) {
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg("获取活动线上还是线下的类型，失败,GetActivityTypeIdMap：Err "+err.Error(), 2)
+		}
+	}()
+	list, e := models.GetActivityTypeList("")
+	if e != nil {
+		err = errors.New("GetActivityTypeList, Err: " + e.Error())
+		return
+	}
+	mapResp = make(map[int]int, 0)
+	for _, v := range list {
+		mapResp[v.ActivityTypeId] = v.ActivityType
+	}
+	return
+}

services/es_comprehensive.go

@@ -1186,10 +1186,12 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			e = errors.New("GetActivitySignupResp, Err: " + e.Error())
 			return
 		}
+		activityTypeIdMap := GetActivityTypeIdMap()
 
 		var activityListRersp []*models.ActivityDetail
 		for _, v := range activityList {
 			v.SignupType = mapActivitySignup[v.ActivityId]
+			v.ActivityType = activityTypeIdMap[v.ActivityTypeId] // 线上还是线下
 			activityListRersp = append(activityListRersp, ActivityButtonShow(v))
 		}
 		for _, v := range activityListRersp {