Merge branch 'cygx_10.7' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -676,6 +676,18 @@ func (this *ActivityCoAntroller) SignupAdd() {
 			br.ErrMsg = "获取对应销售失败，Err:" + err.Error()
 			return
 		}
+
+		popupMsg, err := services.CheckActivityUserAll(activityInfo, user)
+		if err != nil {
+			br.Msg = "报名失败！"
+			br.ErrMsg = "CheckActivityUserAll，Err:" + err.Error()
+			return
+		}
+		if popupMsg != "" {
+			br.Msg = "报名失败！"
+			br.ErrMsg = fmt.Sprint("userId:", uid, "Activity:id", popupMsg)
+			return
+		}
 		//人数已满：FullStarffed、单机构超过两人：TwoPeople、爽约次数过多：BreakPromise、超时：Overtime 、成功：Success"`
 		//如果是下面几种情况则对报名信息做判断限制 （公司调研电话会（限制人数）、公司线下调研、专家/分析师线下沙龙）
 		//if (activityInfo.ActivityTypeId == 3 && activityInfo.IsLimitPeople == 1) || activityInfo.ActivityTypeId > 3 {

services/activity_signup.go

@@ -124,3 +124,20 @@ func CheckActivityUserEmail(activityInfo *models.ActivityDetail, wxUser *models.
 	}
 	return
 }
+
+// 校验报名是否需要绑定邮箱
+func CheckActivityUserAll(activityInfo *models.ActivityDetail, wxUser *models.WxUserItem) (popupMsg string, err error) {
+	_, popupMsg = CheckSiginupDeadline(activityInfo)
+	if popupMsg != "" {
+		return
+	}
+	_, popupMsg, _, _, err = CheckActivityPoints(activityInfo, wxUser)
+	if popupMsg != "" {
+		return
+	}
+	_, popupMsg = CheckActivityUserEmail(activityInfo, wxUser)
+	if popupMsg != "" {
+		return
+	}
+	return
+}