|
@@ -888,13 +888,21 @@ func (this *ActivityCoAntroller) SignupAdd() {
|
|
|
item.CompanyName = user.CompanyName
|
|
|
item.SignupType = signupType
|
|
|
item.DoFailType = item.FailType
|
|
|
- item.OutboundMobile = user.Mobile
|
|
|
- if user.CountryCode == "" {
|
|
|
- item.CountryCode = "86"
|
|
|
+ if user.OutboundMobile != "" {
|
|
|
+ item.OutboundMobile = user.OutboundMobile
|
|
|
+ if user.OutboundCountryCode == "" {
|
|
|
+ item.CountryCode = "86"
|
|
|
+ } else {
|
|
|
+ item.CountryCode = user.OutboundCountryCode
|
|
|
+ }
|
|
|
} else {
|
|
|
- item.CountryCode = user.CountryCode
|
|
|
+ item.OutboundMobile = user.Mobile
|
|
|
+ if user.CountryCode == "" {
|
|
|
+ item.CountryCode = "86"
|
|
|
+ } else {
|
|
|
+ item.CountryCode = user.CountryCode
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
//添加报名信息,但是不加入日程
|
|
|
_, errSignup := models.AddActivitySignupNoSchedule(item)
|
|
|
if errSignup != nil {
|
|
@@ -928,10 +936,20 @@ func (this *ActivityCoAntroller) SignupAdd() {
|
|
|
item.FailType = 0
|
|
|
item.DoFailType = 0
|
|
|
item.OutboundMobile = user.Mobile
|
|
|
- if user.CountryCode == "" {
|
|
|
- item.CountryCode = "86"
|
|
|
+ if user.OutboundMobile != "" {
|
|
|
+ item.OutboundMobile = user.OutboundMobile
|
|
|
+ if user.OutboundCountryCode == "" {
|
|
|
+ item.CountryCode = "86"
|
|
|
+ } else {
|
|
|
+ item.CountryCode = user.OutboundCountryCode
|
|
|
+ }
|
|
|
} else {
|
|
|
- item.CountryCode = user.CountryCode
|
|
|
+ item.OutboundMobile = user.Mobile
|
|
|
+ if user.CountryCode == "" {
|
|
|
+ item.CountryCode = "86"
|
|
|
+ } else {
|
|
|
+ item.CountryCode = user.CountryCode
|
|
|
+ }
|
|
|
}
|
|
|
_, errSignup := models.AddActivitySignup(item)
|
|
|
if errSignup != nil {
|
|
@@ -966,7 +984,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
|
|
|
}
|
|
|
if signupType == 1 && user.IsMsgOutboundMobile == 0 {
|
|
|
resp.GoOutboundMobile = true
|
|
|
- go models.ModifyWxUserIsMsgOutboundMobile(user.UserId)
|
|
|
+ //go models.ModifyWxUserIsMsgOutboundMobile(user.UserId)
|
|
|
}
|
|
|
if user.OutboundMobile == "" {
|
|
|
resp.Mobile = user.Mobile
|