活动报名优化

controllers/activity.go

@@ -471,10 +471,6 @@ func (this *ActivityCoAntroller) SignupAdd() {
 				return
 			}
 		}
-		if (activityInfo.ActivityTypeId == 1 || activityInfo.ActivityTypeId == 3) && strings.Contains(permissionStr, "专家") {
-			hasPermission = 1
-			resp.HaqveJurisdiction = true
-		}
 		//1专家电话会、2分析师电话会、3公司调研电话会、4公司线下调研、5专家线下沙龙、6分析师线下沙龙
 		//OperationMode     string `description:"操作方式 Apply:立即申请、Call:拨号 为空则为有权限"`
 		if activityInfo.ActivityTypeId != 1 && activityInfo.ActivityTypeId != 4 && permissionStr == "专家" {
@@ -489,6 +485,14 @@ func (this *ActivityCoAntroller) SignupAdd() {
 				resultTime := utils.StrTimeToTime(activityInfo.ActivityTime) //时间字符串格式转时间格式
 				if time.Now().After(resultTime.Add(-time.Minute * 60)) {
 					signupStatus = "Overtime"
+					resp.SignupType = signupType
+					resp.SignupStatus = signupStatus
+					resp.HasPermission = hasPermission
+					br.Ret = 200
+					br.Success = true
+					br.Msg = ""
+					br.Data = resp
+					return
 				}
 				//人数已满：FullStarffed、单机构超过两人：TwoPeople、爽约次数过多：BreakPromise、超时：Overtime 、成功：Success"`
 				//如果是下面几种情况则对报名信息做判断限制 （公司调研电话会（限制人数）、公司线下调研、专家/分析师线下沙龙）

models/activity.go

@@ -297,6 +297,7 @@ WHERE
 	1 = 1 
 	AND s.is_send_wx_msg = 0 
 	AND a.publish_status = 1 
+	AND c.create_platform = 1
 	AND a.activity_time <= ? AND a.activity_time >= NOW() 
 	AND s.is_cancel = 0
 	AND( a.activity_type_id IN (4,5,6) OR (a.activity_type_id = 3 AND a.is_limit_people = 1 )) 	GROUP BY s.id`
@@ -321,6 +322,7 @@ WHERE
 	AND a.publish_status = 1 
 	AND a.activity_time <= ? AND a.activity_time >= NOW() 
 	AND m.is_cancel = 0 
+	AND c.create_platform = 1
 	AND (
 	a.activity_type_id IN ( 1, 2 ) 
 	OR ( a.activity_type_id = 3 AND a.is_limit_people = 0 ))

services/task.go

@@ -46,8 +46,8 @@ func Task() {
 	sendActivityBeginMsgMeeting := toolbox.NewTask("sendActivityBeginMsgMeeting", "0 */5 * * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
 	toolbox.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
 
-	getSummarytoEs := toolbox.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
-	toolbox.AddTask("getSummarytoEs", getSummarytoEs)
+	//getSummarytoEs := toolbox.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
+	//toolbox.AddTask("getSummarytoEs", getSummarytoEs)
 
 	toolbox.StartTask()