|
@@ -12,6 +12,7 @@ import ( |
|
@@ -12,6 +12,7 @@ import ( |
12
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain/service"
|
12
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain/service"
|
13
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/dao"
|
13
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/dao"
|
14
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/utils"
|
14
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/utils"
|
|
|
15
|
+ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/log"
|
15
|
"strconv"
|
16
|
"strconv"
|
16
|
"time"
|
17
|
"time"
|
17
|
)
|
18
|
)
|
|
@@ -123,6 +124,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC |
|
@@ -123,6 +124,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC |
123
|
var undertakerDomain *domain.Undertaker
|
124
|
var undertakerDomain *domain.Undertaker
|
124
|
undertakerUid, _ := strconv.ParseInt(undertaker.UserId, 10, 64)
|
125
|
undertakerUid, _ := strconv.ParseInt(undertaker.UserId, 10, 64)
|
125
|
if data, err := userService.UndertakerFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, undertakerUid); err != nil {
|
126
|
if data, err := userService.UndertakerFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, undertakerUid); err != nil {
|
|
|
127
|
+ log.Logger.Error(err.Error())
|
126
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
128
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
127
|
} else {
|
129
|
} else {
|
128
|
undertakerDomain = data
|
130
|
undertakerDomain = data
|
|
@@ -131,19 +133,25 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC |
|
@@ -131,19 +133,25 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC |
131
|
// 获取推荐人
|
133
|
// 获取推荐人
|
132
|
var referrerDomain *domain.Referrer
|
134
|
var referrerDomain *domain.Referrer
|
133
|
referrerUid, _ := strconv.ParseInt(undertaker.ReferrerId, 10, 64)
|
135
|
referrerUid, _ := strconv.ParseInt(undertaker.ReferrerId, 10, 64)
|
134
|
- if data, err := userService.ReferrerFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, referrerUid); err != nil {
|
|
|
135
|
- return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
136
|
- } else {
|
|
|
137
|
- referrerDomain = data
|
136
|
+ if referrerUid > 0 {
|
|
|
137
|
+ if data, err := userService.ReferrerFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, referrerUid); err != nil {
|
|
|
138
|
+ log.Logger.Error(err.Error())
|
|
|
139
|
+ return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
140
|
+ } else {
|
|
|
141
|
+ referrerDomain = data
|
|
|
142
|
+ }
|
138
|
}
|
143
|
}
|
139
|
|
144
|
|
140
|
// 获取业务员
|
145
|
// 获取业务员
|
141
|
var salesmanDomain *domain.Salesman
|
146
|
var salesmanDomain *domain.Salesman
|
142
|
salesmanUid, _ := strconv.ParseInt(undertaker.SalesmanId, 10, 64)
|
147
|
salesmanUid, _ := strconv.ParseInt(undertaker.SalesmanId, 10, 64)
|
143
|
- if data, err := userService.SalesmanFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, salesmanUid); err != nil {
|
|
|
144
|
- return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
145
|
- } else {
|
|
|
146
|
- salesmanDomain = data
|
148
|
+ if salesmanUid > 0 {
|
|
|
149
|
+ if data, err := userService.SalesmanFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, salesmanUid); err != nil {
|
|
|
150
|
+ log.Logger.Error(err.Error())
|
|
|
151
|
+ return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
152
|
+ } else {
|
|
|
153
|
+ salesmanDomain = data
|
|
|
154
|
+ }
|
147
|
}
|
155
|
}
|
148
|
|
156
|
|
149
|
undertakers = append(undertakers, &domain.Undertaker{
|
157
|
undertakers = append(undertakers, &domain.Undertaker{
|
|
@@ -171,6 +179,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC |
|
@@ -171,6 +179,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC |
171
|
var relevantDomain *domain.Relevant
|
179
|
var relevantDomain *domain.Relevant
|
172
|
relevantUid, _ := strconv.ParseInt(relevantPersonUid, 10, 64)
|
180
|
relevantUid, _ := strconv.ParseInt(relevantPersonUid, 10, 64)
|
173
|
if data, err := userService.RelevantFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, relevantUid); err != nil {
|
181
|
if data, err := userService.RelevantFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, relevantUid); err != nil {
|
|
|
182
|
+ log.Logger.Error(err.Error())
|
174
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
183
|
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
175
|
} else {
|
184
|
} else {
|
176
|
relevantDomain = data
|
185
|
relevantDomain = data
|
|
@@ -751,19 +760,23 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC |
|
@@ -751,19 +760,23 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC |
751
|
// 获取推荐人
|
760
|
// 获取推荐人
|
752
|
var referrerDomain *domain.Referrer
|
761
|
var referrerDomain *domain.Referrer
|
753
|
referrerUid, _ := strconv.ParseInt(undertaker.ReferrerId, 10, 64)
|
762
|
referrerUid, _ := strconv.ParseInt(undertaker.ReferrerId, 10, 64)
|
754
|
- if data, err := userService.ReferrerFrom(updateCooperationContractCommand.CompanyId, updateCooperationContractCommand.OrgId, referrerUid); err != nil {
|
|
|
755
|
- return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
756
|
- } else {
|
|
|
757
|
- referrerDomain = data
|
763
|
+ if referrerUid > 0 {
|
|
|
764
|
+ if data, err := userService.ReferrerFrom(updateCooperationContractCommand.CompanyId, updateCooperationContractCommand.OrgId, referrerUid); err != nil {
|
|
|
765
|
+ return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
766
|
+ } else {
|
|
|
767
|
+ referrerDomain = data
|
|
|
768
|
+ }
|
758
|
}
|
769
|
}
|
759
|
|
770
|
|
760
|
// 获取业务员
|
771
|
// 获取业务员
|
761
|
var salesmanDomain *domain.Salesman
|
772
|
var salesmanDomain *domain.Salesman
|
762
|
salesmanUid, _ := strconv.ParseInt(undertaker.SalesmanId, 10, 64)
|
773
|
salesmanUid, _ := strconv.ParseInt(undertaker.SalesmanId, 10, 64)
|
763
|
- if data, err := userService.SalesmanFrom(updateCooperationContractCommand.CompanyId, updateCooperationContractCommand.OrgId, salesmanUid); err != nil {
|
|
|
764
|
- return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
765
|
- } else {
|
|
|
766
|
- salesmanDomain = data
|
774
|
+ if salesmanUid > 0 {
|
|
|
775
|
+ if data, err := userService.SalesmanFrom(updateCooperationContractCommand.CompanyId, updateCooperationContractCommand.OrgId, salesmanUid); err != nil {
|
|
|
776
|
+ return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
|
|
|
777
|
+ } else {
|
|
|
778
|
+ salesmanDomain = data
|
|
|
779
|
+ }
|
767
|
}
|
780
|
}
|
768
|
|
781
|
|
769
|
undertakers = append(undertakers, &domain.Undertaker{
|
782
|
undertakers = append(undertakers, &domain.Undertaker{
|