|
@@ -416,11 +416,6 @@ func (this *ActivityCoAntroller) SignupAdd() {
|
|
|
return
|
|
|
}
|
|
|
companyItem, err := models.GetCompanyDetailAllById(user.CompanyId)
|
|
|
- //if err != nil {
|
|
|
- // br.Msg = "获取信息失败"
|
|
|
- // br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
|
|
|
- // return
|
|
|
- //}
|
|
|
//冻结客户
|
|
|
if err != nil {
|
|
|
if err.Error() == utils.ErrNoRow() {
|
|
@@ -488,13 +483,13 @@ func (this *ActivityCoAntroller) SignupAdd() {
|
|
|
signupStatus = "FullStarffed"
|
|
|
item.FailType = 1
|
|
|
}
|
|
|
- total, err = models.GetActivitySignupCount(uid, activityId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取失败,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
- if signupStatus != "Success" && total == 0 {
|
|
|
+ //total, err = models.GetActivitySignupCount(uid, activityId)
|
|
|
+ //if err != nil {
|
|
|
+ // br.Msg = "获取失败"
|
|
|
+ // br.ErrMsg = "获取失败,Err:" + err.Error()
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ if signupStatus != "Success" && item.FailType > 0 {
|
|
|
item.UserId = uid
|
|
|
item.ActivityId = activityId
|
|
|
item.CreateTime = time.Now()
|
|
@@ -503,6 +498,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
|
|
|
item.CompanyId = user.CompanyId
|
|
|
item.CompanyName = user.CompanyName
|
|
|
item.SignupType = signupType
|
|
|
+ item.DoFailType = item.FailType
|
|
|
//添加报名信息,但是不加入日程
|
|
|
_, errSignup := models.AddActivitySignupNoSchedule(item)
|
|
|
if errSignup != nil {
|
|
@@ -532,6 +528,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
|
|
|
item.CompanyName = user.CompanyName
|
|
|
item.SignupType = signupType
|
|
|
item.FailType = 0
|
|
|
+ item.DoFailType = 0
|
|
|
_, errSignup := models.AddActivitySignup(item)
|
|
|
if errSignup != nil {
|
|
|
br.Msg = "操作失败"
|