Browse Source

禁用报名用户权限优化

xingzai 3 years ago
parent
commit
1d64cee09a
2 changed files with 18 additions and 24 deletions
  1. 17 23
      controllers/activity.go
  2. 1 1
      services/task.go

+ 17 - 23
controllers/activity.go

@@ -499,43 +499,37 @@ func (this *ActivityCoAntroller) SignupAdd() {
 
 				if (activityInfo.ActivityTypeId == 3 && activityInfo.IsLimitPeople == 1) || activityInfo.ActivityTypeId > 3 {
 					//判断优先级:总人数限制→单机构2人限制→爽约3次限制
-					total, err = models.GetUserRestrictCount(user.UserId)
+					totalRestrict, err := models.GetUserRestrictCount(user.UserId)
 					if err != nil {
 						br.Msg = "获取信息失败"
 						br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 						return
 					}
-					if total >= 1 {
+					if totalRestrict >= 1 {
 						signupStatus = "BreakPromise"
 						item.FailType = 3
 					}
-					total, err = models.GetActivitySignupCompanyCount(activityId, user.CompanyId)
+					totalSignupCompany, err := models.GetActivitySignupCompanyCount(activityId, user.CompanyId)
 					if err != nil {
 						br.Msg = "获取信息失败"
 						br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 						return
 					}
-					if total >= 2 {
+					if totalSignupCompany >= 2 {
 						signupStatus = "TwoPeople"
 						item.FailType = 2
 					}
-					total, err = models.GetActivitySignupSuccessCount(activityId)
+					totaSignupPeopleNum, err := models.GetActivitySignupSuccessCount(activityId)
 					if err != nil {
 						br.Msg = "获取信息失败"
 						br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 						return
 					}
-					if total >= activityInfo.LimitPeopleNum {
+					if totaSignupPeopleNum >= activityInfo.LimitPeopleNum {
 						signupStatus = "FullStarffed"
 						item.FailType = 1
 					}
-					totalMy, err := models.GetActivitySignupCount(uid, activityId)
-					if err != nil {
-						br.Msg = "获取失败"
-						br.ErrMsg = "获取失败,Err:" + err.Error()
-						return
-					}
-					if signupStatus != "Success" && totalMy == 0 {
+					if signupStatus != "Success" {
 						item.UserId = uid
 						item.ActivityId = activityId
 						item.CreateTime = time.Now()
@@ -554,17 +548,17 @@ func (this *ActivityCoAntroller) SignupAdd() {
 						}
 					}
 				}
+				totalMy, err := models.GetActivitySignupCount(uid, activityId)
+				if err != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取失败,Err:" + err.Error()
+					return
+				}
+				if totalMy > 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
-					}
 					item.UserId = uid
 					item.ActivityId = activityId
 					item.CreateTime = time.Now()

+ 1 - 1
services/task.go

@@ -48,7 +48,7 @@ func Task() {
 
 	//getSummarytoEs := toolbox.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
 	//toolbox.AddTask("getSummarytoEs", getSummarytoEs)
-
+	UpdateActivitySattus()
 	toolbox.StartTask()
 
 	//toolbox.StartTask()