报名，和添加会议提醒优化

controllers/activity.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"rdluck_tools/paging"
@@ -370,7 +369,6 @@ func (this *ActivityCoAntroller) SignupAdd() {
 		signupStatus = "Overtime"
 	}
 	total, errtotal := models.GetActivitySignupCount(uid, activityId)
-	fmt.Println(total)
 	if errtotal != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + errtotal.Error()
@@ -399,6 +397,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
 	resp := new(models.SignupStatus)
 	resp.SignupType = signupType
 	resp.SignupStatus = signupStatus
+	resp.ActivityId = activityId
 	if activityId%2 == 1 {
 		resp.GoFollow = true
 	}
@@ -478,6 +477,8 @@ func (this *ActivityCoAntroller) SignupCancel() {
 	item.Email = user.Email
 	item.CompanyId = user.CompanyId
 	item.CompanyName = user.CompanyName
+	resp := new(models.SignupStatus)
+	resp.ActivityId = activityId
 	_, errSignup := models.CancelActivitySignup(item)
 	if errSignup != nil {
 		br.Msg = "操作失败"
@@ -487,6 +488,7 @@ func (this *ActivityCoAntroller) SignupCancel() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
+	br.Data = resp
 }
 
 // @Title  用户搜索详情
@@ -616,54 +618,55 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 	}
 	resultTime := utils.StrTimeToTime(activityInfo.ActivityTime) //时间字符串格式转时间格式
 	if time.Now().After(resultTime.Add(-time.Minute * 15)) {
-		signupStatus = "Overtime"
+		br.Msg = "活动开始前15分钟无法设置会议提醒"
+		return
+	}
+	//if signupStatus == "Success" {
+	total, err := models.GetActivitySignupCount(uid, activityId)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	if total == 0 {
+		br.Msg = "您暂未预约外呼这个活动"
 		return
 	}
-	if signupStatus == "Success" {
-		total, err := models.GetActivitySignupCount(uid, activityId)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，Err:" + err.Error()
-			return
-		}
-		if total == 0 {
-			br.Msg = "您暂未预约外呼这个活动"
-			return
-		}
 
-		totalMeeting, errMeeting := models.GetActivityMeetingReminderCount(uid, activityId)
-		if errMeeting != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，Err:" + err.Error()
-			return
-		}
-		if totalMeeting > 0 {
-			br.Msg = "您已预约，请勿重复预约"
-			return
-		}
+	totalMeeting, errMeeting := models.GetActivityMeetingReminderCount(uid, activityId)
+	if errMeeting != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	if totalMeeting > 0 {
+		br.Msg = "您已预约，请勿重复预约"
+		return
+	}
 
-		item.UserId = uid
-		item.ActivityId = activityId
-		item.CreateTime = time.Now()
-		item.Mobile = user.Mobile
-		item.Email = user.Email
-		item.CompanyId = user.CompanyId
-		item.CompanyName = user.CompanyName
-		_, errSignup := models.AddActivityMeetingReminder(item)
-		if errSignup != nil {
-			br.Msg = "操作失败"
-			br.ErrMsg = "操作失败,Err:" + errSignup.Error()
-			return
-		}
+	item.UserId = uid
+	item.ActivityId = activityId
+	item.CreateTime = time.Now()
+	item.Mobile = user.Mobile
+	item.Email = user.Email
+	item.CompanyId = user.CompanyId
+	item.CompanyName = user.CompanyName
+	_, errSignup := models.AddActivityMeetingReminder(item)
+	if errSignup != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + errSignup.Error()
+		return
 	}
+	//}
 	resp := new(models.SignupStatus)
 	resp.SignupStatus = signupStatus
+	resp.ActivityId = activityId
 	if activityId%2 == 1 {
 		resp.GoFollow = true
 	}
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "操作成功"
+	br.Msg = "设置成功，会前15分钟会为您推送微信消息提醒"
 	br.Data = resp
 }
 
@@ -707,38 +710,40 @@ func (this *ActivityCoAntroller) MeetingReminderCancel() {
 		br.ErrMsg = "操作失败,Err:" + errInfo.Error()
 		return
 	}
+
+	//if signupStatus == "Success" {
+	total, err := models.GetActivityMeetingReminderCount(uid, activityId)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	if total == 0 {
+		br.Msg = "您暂未添加该活动会议提醒"
+		return
+	}
 	resultTime := utils.StrTimeToTime(activityInfo.ActivityTime) //时间字符串格式转时间格式
 	if time.Now().After(resultTime.Add(-time.Minute * 15)) {
-		signupStatus = "Overtime"
+		br.Msg = "活动开始前15分钟无法取消会议提醒"
 		return
 	}
-	if signupStatus == "Success" {
-		total, err := models.GetActivityMeetingReminderCount(uid, activityId)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，Err:" + err.Error()
-			return
-		}
-		if total == 0 {
-			br.Msg = "您暂未添加该活动会议提醒"
-			return
-		}
-		item.UserId = uid
-		item.ActivityId = activityId
-		item.CreateTime = time.Now()
-		item.Mobile = user.Mobile
-		item.Email = user.Email
-		item.CompanyId = user.CompanyId
-		item.CompanyName = user.CompanyName
-		_, errSignup := models.CancelActivityMeetingReminder(item)
-		if errSignup != nil {
-			br.Msg = "操作失败"
-			br.ErrMsg = "操作失败,Err:" + errSignup.Error()
-			return
-		}
+	item.UserId = uid
+	item.ActivityId = activityId
+	item.CreateTime = time.Now()
+	item.Mobile = user.Mobile
+	item.Email = user.Email
+	item.CompanyId = user.CompanyId
+	item.CompanyName = user.CompanyName
+	_, errSignup := models.CancelActivityMeetingReminder(item)
+	if errSignup != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "操作失败,Err:" + errSignup.Error()
+		return
 	}
+	//}
 	resp := new(models.SignupStatus)
 	resp.SignupStatus = signupStatus
+	resp.ActivityId = activityId
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

models/activity_signup.go

@@ -22,6 +22,7 @@ type SignupStatus struct {
 	SignupStatus string `description:"返回状态：人数已满：FullStarffed、单机构超过两人：TwoPeople、爽约次数过多：BreakPromise、超时：Overtime 、成功：Success"`
 	GoFollow     bool   `description:"是否去关注"`
 	SignupType   int    `description:"报名方式，1预约外呼，2我要报名"`
+	ActivityId   int    `description:"活动ID"`
 }
 
 //报名记录日志