作者 tangxuhui

数据结构更新

@@ -2,6 +2,7 @@ package command @@ -2,6 +2,7 @@ package command
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
  5 +
5 "github.com/beego/beego/v2/core/validation" 6 "github.com/beego/beego/v2/core/validation"
6 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" 7 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
7 ) 8 )
@@ -14,8 +15,8 @@ type CreditAccountPayCommand struct { @@ -14,8 +15,8 @@ type CreditAccountPayCommand struct {
14 // 账期结算实付金额 15 // 账期结算实付金额
15 ActuallyPaidAmount float64 `cname:"账期结算实付金额" json:"actuallyPaidAmount" valid:"Required"` 16 ActuallyPaidAmount float64 `cname:"账期结算实付金额" json:"actuallyPaidAmount" valid:"Required"`
16 // 备注 17 // 备注
17 - Remarks string `cname:"备注" json:"remark"`  
18 - Attachment domain.Attachment `json:"paymentDocumentAttachment"` //附件 18 + Remarks string `cname:"备注" json:"remark"`
  19 + Attachment []domain.Attachment `json:"paymentDocumentAttachment"` //附件
19 } 20 }
20 21
21 func (cmd *CreditAccountPayCommand) Valid(validation *validation.Validation) { 22 func (cmd *CreditAccountPayCommand) Valid(validation *validation.Validation) {
@@ -183,13 +183,13 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC @@ -183,13 +183,13 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
183 underTakers = append(underTakers, u) 183 underTakers = append(underTakers, u)
184 } 184 }
185 result, err := creationCooperationGateway.CooperationContractUpdate(allied_creation_cooperation.ReqCooperationContractUpdate{ 185 result, err := creationCooperationGateway.CooperationContractUpdate(allied_creation_cooperation.ReqCooperationContractUpdate{
186 - CooperationContractId: updateCooperationContractCommand.CooperationContract.CooperationContractId,  
187 - MoneyIncentivesRules: rules2,  
188 - DividendsIncentivesRules: rules1,  
189 - Undertakers: underTakers,  
190 - RelevantIds: updateCooperationContractCommand.RelationUser,  
191 - CooperationContractDescription: updateCooperationContractCommand.CooperationContract.CooperationContractDescription,  
192 - CooperationContractNumber: updateCooperationContractCommand.CooperationContract.CooperationContractNumber, 186 + CooperationContractId: updateCooperationContractCommand.CooperationContract.CooperationContractId,
  187 + MoneyIncentivesRules: rules2,
  188 + DividendsIncentivesRules: rules1,
  189 + Undertakers: underTakers,
  190 + RelevantIds: updateCooperationContractCommand.RelationUser,
  191 + CooperationContractDescription: updateCooperationContractCommand.CooperationContract.CooperationContractDescription,
  192 + // CooperationContractNumber: updateCooperationContractCommand.CooperationContract.CooperationContractNumber,
193 CooperationProjectNumber: updateCooperationContractCommand.CooperationContract.CooperationProjectNumber, 193 CooperationProjectNumber: updateCooperationContractCommand.CooperationContract.CooperationProjectNumber,
194 DepartmentId: updateCooperationContractCommand.CooperationContract.DepartmentId, 194 DepartmentId: updateCooperationContractCommand.CooperationContract.DepartmentId,
195 CooperationContractUndertakerType: updateCooperationContractCommand.CooperationContract.CooperationContractUndertakerType, 195 CooperationContractUndertakerType: updateCooperationContractCommand.CooperationContract.CooperationContractUndertakerType,
@@ -3,9 +3,9 @@ package command @@ -3,9 +3,9 @@ package command
3 import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" 3 import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
4 4
5 type PayCreditAccountCommand struct { 5 type PayCreditAccountCommand struct {
6 - Operator domain.Operator `json:"-"` //操作人  
7 - CreditAccountId int `json:"creditAccountId,string"` //账期结算id  
8 - ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际金额  
9 - Remarks string `json:"remarks"` //备注  
10 - Attachment domain.Attachment `json:"attachment"` //附件 6 + Operator domain.Operator `json:"-"` //操作人
  7 + CreditAccountId int `json:"creditAccountId,string"` //账期结算id
  8 + ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际金额
  9 + Remarks string `json:"remarks"` //备注
  10 + Attachment []domain.Attachment `json:"attachment"` //附件
11 } 11 }
@@ -169,8 +169,8 @@ type ( @@ -169,8 +169,8 @@ type (
169 } 169 }
170 170
171 ReqCooperationContractAdd struct { 171 ReqCooperationContractAdd struct {
172 - CooperationContractDescription string `json:"cooperationContractDescription"` // 共创合约描述  
173 - CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号 172 + CooperationContractDescription string `json:"cooperationContractDescription"` // 共创合约描述
  173 + // CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
174 CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号, 174 CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号,
175 DepartmentId string `json:"departmentId"` // 共创合约发起部门id 175 DepartmentId string `json:"departmentId"` // 共创合约发起部门id
176 CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象,1员工,2共创用户,3公开 176 CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象,1员工,2共创用户,3公开
@@ -195,9 +195,9 @@ type ( @@ -195,9 +195,9 @@ type (
195 //更新共创合约 195 //更新共创合约
196 type ( 196 type (
197 ReqCooperationContractUpdate struct { 197 ReqCooperationContractUpdate struct {
198 - CooperationContractId int `json:"cooperationContractId,string"` // 共创合约id  
199 - CooperationContractDescription string `json:"cooperationContractDescription"` //共创  
200 - CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号 198 + CooperationContractId int `json:"cooperationContractId,string"` // 共创合约id
  199 + CooperationContractDescription string `json:"cooperationContractDescription"` //共创
  200 + // CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
201 CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号, 201 CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号,
202 DepartmentId string `json:"departmentId"` // 共创合约发起部门id 202 DepartmentId string `json:"departmentId"` // 共创合约发起部门id
203 CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象,1员工,2共创用户,3公开 203 CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象,1员工,2共创用户,3公开
@@ -51,10 +51,10 @@ type CreditAccount struct { @@ -51,10 +51,10 @@ type CreditAccount struct {
51 //支付账期结算 51 //支付账期结算
52 type ( 52 type (
53 ReqCreditAccountsPay struct { 53 ReqCreditAccountsPay struct {
54 - CreditAccountId int `json:"creditAccountId,string"`  
55 - ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际支付金额  
56 - Remarks string `json:"remarks"`  
57 - Attachment domain.Attachment `json:"paymentDocumentAttachment"` //附件 54 + CreditAccountId int `json:"creditAccountId,string"`
  55 + ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际支付金额
  56 + Remarks string `json:"remarks"`
  57 + Attachment []domain.Attachment `json:"paymentDocumentAttachment"` //附件
58 } 58 }
59 59
60 DataCreditAccountsPay struct { 60 DataCreditAccountsPay struct {