Merge branch 'crm_15.7' into debug

controller/public.go

@@ -609,6 +609,15 @@ func ResearchSignUp(c *gin.Context) {
 	//	response.Fail(errMsg, c)
 	//	return
 	//}
+	count, err := yb_research_signup_statistics.GetSignUpCountByMobileAndBannerId(mobile, bannerId)
+	if err != nil {
+		response.FailData("查询失败", "查询失败，Err:"+err.Error(), c)
+		return
+	}
+	if count > 0 {
+		response.FailData("报名失败", "该手机号已报名，Err:"+err.Error(), c)
+		return
+	}
 	ob := &yb_research_signup_statistics.YbResearchSignupStatistics{
 		Mobile:            mobile,
 		CustomCompanyName: customCompanyName,
@@ -619,7 +628,7 @@ func ResearchSignUp(c *gin.Context) {
 		CustomMobile:      customMobile,
 		CreateTime:        time.Now(),
 	}
-	err := ob.Create()
+	err = ob.Create()
 	if err != nil {
 		response.FailData("报名失败", "报名失败，Err:"+err.Error(), c)
 		return

models/tables/yb_research_signup_statistics/model.go

@@ -7,3 +7,9 @@ func (m *YbResearchSignupStatistics) Create() (err error) {
 	return
 }
 
+
+// GetBySandboxId 根据沙盘ID查询详情
+func GetSignUpCountByMobileAndBannerId(mobile string, bannerId int) (count int64, err error) {
+	err = global.DEFAULT_MYSQL.Where("mobile = ? and banner_id=0 ", mobile, bannerId).Count(&count).Error
+	return
+}