Merge branch 'cygx_12.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -687,6 +687,18 @@ func (this *ActivityCoAntroller) SignupAdd() {
 			br.Data = resp
 			return
 		}
+		//限制人数为1人的专家电话会 用户操作时的消息提示
+		if activityInfo.LimitPeopleNum == 1 && activityInfo.ActivityTypeId == 1 {
+			resp.HasPermission = hasPermission
+			resp.SignupStatus = utils.FULLSTARFFED_MSG
+			resp.PopupMsg = utils.ACTIVITY_ZJDHH_V1_MSG
+			br.Ret = 200
+			br.Success = true
+			br.Msg = ""
+			br.Data = resp
+			return
+		}
+
 		var sellerName string
 		sellerName, err = models.GetCompanySellerName(user.CompanyId)
 		if err != nil {
@@ -1227,6 +1239,19 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 	if havePower {
 		hasPermission = 1
 		signupStatus = "Success"
+
+		//限制人数为1人的专家电话会 用户操作时的消息提示
+		if activityInfo.LimitPeopleNum == 1 && activityInfo.ActivityTypeId == 1 {
+			resp.HasPermission = hasPermission
+			resp.SignupStatus = utils.FULLSTARFFED_MSG
+			resp.PopupMsg = utils.ACTIVITY_ZJDHH_V1_MSG
+			br.Ret = 200
+			br.Success = true
+			br.Msg = ""
+			br.Data = resp
+			return
+		}
+
 		totalMeeting, errMeeting := models.GetActivityMeetingReminderCount(uid, activityId)
 		if errMeeting != nil {
 			br.Msg = "获取失败"
@@ -2197,6 +2222,17 @@ func (this *ActivityCoAntroller) CheckAsk() {
 	if havePower {
 		hasPermission = 1
 		signupStatus = "Success"
+		//限制人数为1人的专家电话会 用户操作时的消息提示
+		if activityInfo.LimitPeopleNum == 1 && activityInfo.ActivityTypeId == 1 {
+			resp.HasPermission = hasPermission
+			resp.SignupStatus = utils.FULLSTARFFED_MSG
+			resp.PopupMsg = utils.ACTIVITY_ZJDHH_V1_MSG
+			br.Ret = 200
+			br.Success = true
+			br.Msg = ""
+			br.Data = resp
+			return
+		}
 		resp.HaqveJurisdiction = true
 		resp.HasPermission = hasPermission
 		resp.SignupStatus = signupStatus
@@ -3469,6 +3505,17 @@ func (this *ActivityCoAntroller) ActivityAppointmentAdd() {
 	if havePower {
 		hasPermission = 1
 		signupStatus = "Success"
+		//限制人数为1人的专家电话会 用户操作时的消息提示
+		if activityInfo.LimitPeopleNum == 1 && activityInfo.ActivityTypeId == 1 {
+			resp.HasPermission = hasPermission
+			resp.SignupStatus = utils.FULLSTARFFED_MSG
+			resp.PopupMsg = utils.ACTIVITY_ZJDHH_V1_MSG
+			br.Ret = 200
+			br.Success = true
+			br.Msg = ""
+			br.Data = resp
+			return
+		}
 		totalMeeting, errMeeting := models.GetUserCygxActivityAppointmentCount(uid, activityId)
 		if errMeeting != nil {
 			br.Msg = "获取失败"

services/activity_signup.go

@@ -42,13 +42,6 @@ func CheckActivitySignUpLimit(user *models.WxUserItem, activityInfo *models.Acti
 			err = errors.New("GetActivitySignupSuccessByUserCountNoHz, Err: " + e.Error())
 			return
 		}
-		if totaSignupPeopleNum == 1 && activityInfo.LimitPeopleNum == 1 {
-			signupStatus = "FullStarffed"
-			popupMsg = "该活动为非公开活动，如有专家访谈需求请联系对口销售"
-			failType = 1
-			return
-		}
-
 		if totaSignupPeopleNum >= activityInfo.LimitPeopleNum {
 			signupStatus = "FullStarffed"
 			popupMsg = "此活动报名人数已满，请留意下期活动"

utils/constants.go

@@ -248,3 +248,8 @@ const (
 	CYGX_YANXUAN_SPECIAL = "研选专栏" //用户阅读数据
 	CYGX_YANXUAN_ARTICLE = "买方研选" //用户阅读数据
 )
+
+const (
+	ACTIVITY_ZJDHH_V1_MSG string = "该活动为非公开活动，如有专家访谈需求请联系对口销售" // 限制人数为1的专家电话会用户C端报名，提示消息内容
+	FULLSTARFFED_MSG      string = "FullStarffed"              // 报名的时候人数已满的状态
+)