allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 yangfu
提交 cbd0e0dce26c5c5326f46b0971763eefeb360334 1 个父辈 e68719ff

查询条件修改

内嵌 并排对比
正在显示 2 个修改的文件 包含 15 行增加 和 2 行删除
@@ -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,20 +133,26 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC @@ -131,20 +133,26 @@ 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)
  136 + if referrerUid > 0 {
134 if data, err := userService.ReferrerFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, referrerUid); err != nil { 137 if data, err := userService.ReferrerFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, referrerUid); err != nil {
  138 + log.Logger.Error(err.Error())
135 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 139 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
136 } else { 140 } else {
137 referrerDomain = data 141 referrerDomain = data
138 } 142 }
  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)
  148 + if salesmanUid > 0 {
143 if data, err := userService.SalesmanFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, salesmanUid); err != nil { 149 if data, err := userService.SalesmanFrom(createCooperationContractCommand.CompanyId, createCooperationContractCommand.OrgId, salesmanUid); err != nil {
  150 + log.Logger.Error(err.Error())
144 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 151 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
145 } else { 152 } else {
146 salesmanDomain = data 153 salesmanDomain = data
147 } 154 }
  155 + }
148 156
149 undertakers = append(undertakers, &domain.Undertaker{ 157 undertakers = append(undertakers, &domain.Undertaker{
150 UndertakerId: 0, 158 UndertakerId: 0,
@@ -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,20 +760,24 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC @@ -751,20 +760,24 @@ 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)
  763 + if referrerUid > 0 {
754 if data, err := userService.ReferrerFrom(updateCooperationContractCommand.CompanyId, updateCooperationContractCommand.OrgId, referrerUid); err != nil { 764 if data, err := userService.ReferrerFrom(updateCooperationContractCommand.CompanyId, updateCooperationContractCommand.OrgId, referrerUid); err != nil {
755 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 765 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
756 } else { 766 } else {
757 referrerDomain = data 767 referrerDomain = data
758 } 768 }
  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)
  774 + if salesmanUid > 0 {
763 if data, err := userService.SalesmanFrom(updateCooperationContractCommand.CompanyId, updateCooperationContractCommand.OrgId, salesmanUid); err != nil { 775 if data, err := userService.SalesmanFrom(updateCooperationContractCommand.CompanyId, updateCooperationContractCommand.OrgId, salesmanUid); err != nil {
764 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 776 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
765 } else { 777 } else {
766 salesmanDomain = data 778 salesmanDomain = data
767 } 779 }
  780 + }
768 781
769 undertakers = append(undertakers, &domain.Undertaker{ 782 undertakers = append(undertakers, &domain.Undertaker{
770 UndertakerId: undertaker.UndertakerId, 783 UndertakerId: undertaker.UndertakerId,
@@ -15,7 +15,7 @@ type SearchCreditAccountQuery struct { @@ -15,7 +15,7 @@ type SearchCreditAccountQuery struct {
15 // 页面大小 15 // 页面大小
16 PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"` 16 PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
17 // 账期结算单号 17 // 账期结算单号
18 - CreditAccountOrderNum string `cname:"账期结算单号" json:"creditAccountOrderNum" valid:"Required"` 18 + CreditAccountOrderNum string `cname:"账期结算单号" json:"creditAccountOrderNum"`
19 // 参与人姓名 19 // 参与人姓名
20 ParticipatorName string `cname:"参与人姓名" json:"participatorName,omitempty"` 20 ParticipatorName string `cname:"参与人姓名" json:"participatorName,omitempty"`
21 // 公司ID，通过集成REST上下文获取 21 // 公司ID，通过集成REST上下文获取
@@ -27,7 +27,7 @@ type SearchCreditAccountQuery struct { @@ -27,7 +27,7 @@ type SearchCreditAccountQuery struct {
27 // 用户基础数据id 27 // 用户基础数据id
28 UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId,string" valid:"Required"` 28 UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId,string" valid:"Required"`
29 // 账期结算支付状态，1待支付，2已支付，APP端结算记录返回已结算的账期结算单 29 // 账期结算支付状态，1待支付，2已支付，APP端结算记录返回已结算的账期结算单
30 - PaymentStatus int32 `cname:"账期结算支付状态" json:"paymentStatus" valid:"Required"` 30 + PaymentStatus int32 `cname:"账期结算支付状态" json:"paymentStatus"`
31 // 结算周期，按年“2021”或者按月结算”2021-07“ 31 // 结算周期，按年“2021”或者按月结算”2021-07“
32 Period time.Time `cname:"结算周期" json:"period,omitempty"` 32 Period time.Time `cname:"结算周期" json:"period,omitempty"`
33 } 33 }