no message

controllers/activity.go

@@ -301,11 +301,22 @@ func (this *ActivityCoAntroller) Detail() {
 	hasPermission := 0
 	var companyDetailStatus string
 	activityInfo, err := models.GetAddActivityInfoByIdShow(uid, activityId)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
+		return
+	}
 	if activityInfo == nil {
 		br.Msg = "活动不存在"
 		br.ErrMsg = "活动ID错误，Err:" + "activityId：" + strconv.Itoa(activityId)
 		return
 	}
+	applyCount, err := models.GetApplyRecordCount(uid)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
+		return
+	}
 	if user.CompanyId <= 1 {
 		companyDetailStatus = ""
 	} else {
@@ -316,7 +327,12 @@ func (this *ActivityCoAntroller) Detail() {
 			return
 		}
 		if companyPermission == "" {
-			resp.HasPermission = 2
+			if applyCount > 0 {
+				hasPermission = 4
+			} else {
+				hasPermission = 3
+			}
+			resp.HasPermission = hasPermission
 			resp.OperationMode = "Apply"
 			resp.PopupMsg = "您暂无权限参加 【" + activityInfo.ChartPermissionName + "】行业活动，若想参加可以申请开通哦"
 			br.Ret = 200
@@ -399,12 +415,7 @@ func (this *ActivityCoAntroller) Detail() {
 	activityInfo.ShowType = detail.ShowType
 
 	//判断是否已经申请过
-	applyCount, err := models.GetApplyRecordCount(uid)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
-		return
-	}
+
 	if user.CompanyId > 1 {
 		permissionStr, err := models.GetCompanyPermission(user.CompanyId)
 		if err != nil {
@@ -516,6 +527,14 @@ func (this *ActivityCoAntroller) SignupAdd() {
 	}
 	activityId := req.ActivityId
 	signupType := req.SignupType
+	hasPermission := 0
+	//判断是否已经申请过
+	applyCount, err := models.GetApplyRecordCount(uid)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
+		return
+	}
 	activityInfo, errInfo := models.GetAddActivityInfoById(activityId)
 	if activityInfo == nil {
 		br.Msg = "操作失败"
@@ -540,7 +559,12 @@ func (this *ActivityCoAntroller) SignupAdd() {
 			return
 		}
 		if companyPermission == "" {
-			resp.HasPermission = 4
+			if applyCount > 0 {
+				hasPermission = 4
+			} else {
+				hasPermission = 3
+			}
+			resp.HasPermission = hasPermission
 			resp.OperationMode = "Apply"
 			resp.PopupMsg = "您暂无权限参加 【" + activityInfo.ChartPermissionName + "】行业活动，若想参加可以申请开通哦"
 			br.Ret = 200
@@ -599,16 +623,6 @@ func (this *ActivityCoAntroller) SignupAdd() {
 		}
 	}
 	item := new(models.CygxActivitySignup)
-
-	hasPermission := 0
-	//判断是否已经申请过
-	applyCount, err := models.GetApplyRecordCount(uid)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
-		return
-	}
-
 	if user.CompanyId > 1 {
 		permissionStr, err := models.GetCompanyPermission(user.CompanyId)
 		if err != nil {
@@ -1080,6 +1094,13 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 		br.ErrMsg = "操作失败,Err:" + errInfo.Error()
 		return
 	}
+	//判断是否已经申请过
+	applyCount, err := models.GetApplyRecordCount(uid)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
+		return
+	}
 	//SignupStatus string `description:"报名状态：人数已满：FullStarffed、单机构超过两人：TwoPeople、爽约次数过多：BreakPromise、超时：Overtime 、成功：Success"`
 	item := new(models.CygxActivityMeetingReminder)
 	resp := new(models.SignupStatus)
@@ -1095,7 +1116,12 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 			return
 		}
 		if companyPermission == "" {
-			resp.HasPermission = 4
+			if applyCount > 0 {
+				hasPermission = 4
+			} else {
+				hasPermission = 3
+			}
+			resp.HasPermission = hasPermission
 			resp.OperationMode = "Apply"
 			resp.PopupMsg = "您暂无权限参加 【" + activityInfo.ChartPermissionName + "】行业活动，若想参加可以申请开通哦"
 			br.Ret = 200
@@ -1153,13 +1179,6 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 			}
 		}
 	}
-	//判断是否已经申请过
-	applyCount, err := models.GetApplyRecordCount(uid)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取信息失败"
-		br.ErrMsg = "判断是否已申请过试用失败，Err:" + err.Error()
-		return
-	}
 
 	resultTime := utils.StrTimeToTime(activityInfo.ActivityTime) //时间字符串格式转时间格式
 	if time.Now().After(resultTime.Add(-time.Minute * 15)) {