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

转到一个项目

作者 陈志颖
提交 66a9729df0c09271f6e4f61f746c95a31e2aa5fa 1 个父辈 edd56569

feat:账期结算单增加结算明细

内嵌 并排对比
正在显示 5 个修改的文件 包含 20 行增加 和 0 行删除
  1 +package domain
  2 +
  3 +type AccountDetail struct {
  4 + // 承接人分红预算单号
  5 + DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"`
  6 + // 分红类型
  7 + DividendsType string `json:"dividendsType"`
  8 + // 分红金额
  9 + DividendsAmount float64 `json:"dividendsAmount"`
  10 +}
@@ -24,6 +24,8 @@ type CreditAccount struct { @@ -24,6 +24,8 @@ type CreditAccount struct {
24 Participator *Participator `json:"participator"` 24 Participator *Participator `json:"participator"`
25 // 参与类型 25 // 参与类型
26 ParticipateType string `json:"participateType"` 26 ParticipateType string `json:"participateType"`
  27 + // 结算明细
  28 + AccountDetail *AccountDetail `json:"accountDetail"`
27 // 支付凭证附件 29 // 支付凭证附件
28 PaymentDocumentAttachment *Attachment `json:"paymentDocumentAttachment"` 30 PaymentDocumentAttachment *Attachment `json:"paymentDocumentAttachment"`
29 // 数据所属组织机构 31 // 数据所属组织机构
@@ -27,6 +27,8 @@ type CreditAccount struct { @@ -27,6 +27,8 @@ type CreditAccount struct {
27 Participator *domain.Participator `comment:"参与人uid，包括承接人、推荐人、关联业务员" pg:",array"` 27 Participator *domain.Participator `comment:"参与人uid，包括承接人、推荐人、关联业务员" pg:",array"`
28 // 参与类型 28 // 参与类型
29 ParticipateType string `comment:"参与类型，承接人，推荐人，业务员"` 29 ParticipateType string `comment:"参与类型，承接人，推荐人，业务员"`
  30 + // 结算明细
  31 + AccountDetail *domain.AccountDetail `comment:"结算明细"`
30 // 支付凭证附件 32 // 支付凭证附件
31 PaymentDocumentAttachment *domain.Attachment `comment:"支付凭证附件"` 33 PaymentDocumentAttachment *domain.Attachment `comment:"支付凭证附件"`
32 // 数据所属组织机构 34 // 数据所属组织机构
@@ -17,6 +17,7 @@ func TransformToCreditAccountDomainModelFromPgModels(creditAccountModel *models. @@ -17,6 +17,7 @@ func TransformToCreditAccountDomainModelFromPgModels(creditAccountModel *models.
17 CooperationContractNumber: creditAccountModel.CooperationContractNumber, 17 CooperationContractNumber: creditAccountModel.CooperationContractNumber,
18 Participator: creditAccountModel.Participator, 18 Participator: creditAccountModel.Participator,
19 ParticipateType: creditAccountModel.ParticipateType, 19 ParticipateType: creditAccountModel.ParticipateType,
  20 + AccountDetail: creditAccountModel.AccountDetail,
20 PaymentDocumentAttachment: creditAccountModel.PaymentDocumentAttachment, 21 PaymentDocumentAttachment: creditAccountModel.PaymentDocumentAttachment,
21 Org: creditAccountModel.Org, 22 Org: creditAccountModel.Org,
22 Company: creditAccountModel.Company, 23 Company: creditAccountModel.Company,
@@ -36,6 +36,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco @@ -36,6 +36,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco
36 "cooperation_contract_number", 36 "cooperation_contract_number",
37 "participator", 37 "participator",
38 "participate_type", 38 "participate_type",
  39 + "account_detail",
39 "payment_document_attachment", 40 "payment_document_attachment",
40 "org", 41 "org",
41 "company", 42 "company",
@@ -70,6 +71,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco @@ -70,6 +71,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco
70 &creditAccount.CooperationContractNumber, 71 &creditAccount.CooperationContractNumber,
71 &creditAccount.Participator, 72 &creditAccount.Participator,
72 &creditAccount.ParticipateType, 73 &creditAccount.ParticipateType,
  74 + &creditAccount.AccountDetail,
73 &creditAccount.PaymentDocumentAttachment, 75 &creditAccount.PaymentDocumentAttachment,
74 &creditAccount.Org, 76 &creditAccount.Org,
75 &creditAccount.Company, 77 &creditAccount.Company,
@@ -90,6 +92,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco @@ -90,6 +92,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco
90 creditAccount.CooperationContractNumber, 92 creditAccount.CooperationContractNumber,
91 creditAccount.Participator, 93 creditAccount.Participator,
92 creditAccount.ParticipateType, 94 creditAccount.ParticipateType,
  95 + creditAccount.AccountDetail,
93 creditAccount.PaymentDocumentAttachment, 96 creditAccount.PaymentDocumentAttachment,
94 creditAccount.Org, 97 creditAccount.Org,
95 creditAccount.Company, 98 creditAccount.Company,
@@ -114,6 +117,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco @@ -114,6 +117,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco
114 &creditAccount.CooperationContractNumber, 117 &creditAccount.CooperationContractNumber,
115 &creditAccount.Participator, 118 &creditAccount.Participator,
116 &creditAccount.ParticipateType, 119 &creditAccount.ParticipateType,
  120 + &creditAccount.AccountDetail,
117 &creditAccount.PaymentDocumentAttachment, 121 &creditAccount.PaymentDocumentAttachment,
118 &creditAccount.Org, 122 &creditAccount.Org,
119 &creditAccount.Company, 123 &creditAccount.Company,
@@ -134,6 +138,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco @@ -134,6 +138,7 @@ func (repository *CreditAccountRepository) Save(creditAccount *domain.CreditAcco
134 creditAccount.CooperationContractNumber, 138 creditAccount.CooperationContractNumber,
135 creditAccount.Participator, 139 creditAccount.Participator,
136 creditAccount.ParticipateType, 140 creditAccount.ParticipateType,
  141 + creditAccount.AccountDetail,
137 creditAccount.PaymentDocumentAttachment, 142 creditAccount.PaymentDocumentAttachment,
138 creditAccount.Org, 143 creditAccount.Org,
139 creditAccount.Company, 144 creditAccount.Company,