作者 tangxuhui

数据结构更新

... ... @@ -2,6 +2,7 @@ package command
import (
"fmt"
"github.com/beego/beego/v2/core/validation"
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
)
... ... @@ -14,8 +15,8 @@ type CreditAccountPayCommand struct {
// 账期结算实付金额
ActuallyPaidAmount float64 `cname:"账期结算实付金额" json:"actuallyPaidAmount" valid:"Required"`
// 备注
Remarks string `cname:"备注" json:"remark"`
Attachment domain.Attachment `json:"paymentDocumentAttachment"` //附件
Remarks string `cname:"备注" json:"remark"`
Attachment []domain.Attachment `json:"paymentDocumentAttachment"` //附件
}
func (cmd *CreditAccountPayCommand) Valid(validation *validation.Validation) {
... ...
... ... @@ -183,13 +183,13 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
underTakers = append(underTakers, u)
}
result, err := creationCooperationGateway.CooperationContractUpdate(allied_creation_cooperation.ReqCooperationContractUpdate{
CooperationContractId: updateCooperationContractCommand.CooperationContract.CooperationContractId,
MoneyIncentivesRules: rules2,
DividendsIncentivesRules: rules1,
Undertakers: underTakers,
RelevantIds: updateCooperationContractCommand.RelationUser,
CooperationContractDescription: updateCooperationContractCommand.CooperationContract.CooperationContractDescription,
CooperationContractNumber: updateCooperationContractCommand.CooperationContract.CooperationContractNumber,
CooperationContractId: updateCooperationContractCommand.CooperationContract.CooperationContractId,
MoneyIncentivesRules: rules2,
DividendsIncentivesRules: rules1,
Undertakers: underTakers,
RelevantIds: updateCooperationContractCommand.RelationUser,
CooperationContractDescription: updateCooperationContractCommand.CooperationContract.CooperationContractDescription,
// CooperationContractNumber: updateCooperationContractCommand.CooperationContract.CooperationContractNumber,
CooperationProjectNumber: updateCooperationContractCommand.CooperationContract.CooperationProjectNumber,
DepartmentId: updateCooperationContractCommand.CooperationContract.DepartmentId,
CooperationContractUndertakerType: updateCooperationContractCommand.CooperationContract.CooperationContractUndertakerType,
... ...
... ... @@ -3,9 +3,9 @@ package command
import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
type PayCreditAccountCommand struct {
Operator domain.Operator `json:"-"` //操作人
CreditAccountId int `json:"creditAccountId,string"` //账期结算id
ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际金额
Remarks string `json:"remarks"` //备注
Attachment domain.Attachment `json:"attachment"` //附件
Operator domain.Operator `json:"-"` //操作人
CreditAccountId int `json:"creditAccountId,string"` //账期结算id
ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际金额
Remarks string `json:"remarks"` //备注
Attachment []domain.Attachment `json:"attachment"` //附件
}
... ...
... ... @@ -169,8 +169,8 @@ type (
}
ReqCooperationContractAdd struct {
CooperationContractDescription string `json:"cooperationContractDescription"` // 共创合约描述
CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
CooperationContractDescription string `json:"cooperationContractDescription"` // 共创合约描述
// CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号,
DepartmentId string `json:"departmentId"` // 共创合约发起部门id
CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象,1员工,2共创用户,3公开
... ... @@ -195,9 +195,9 @@ type (
//更新共创合约
type (
ReqCooperationContractUpdate struct {
CooperationContractId int `json:"cooperationContractId,string"` // 共创合约id
CooperationContractDescription string `json:"cooperationContractDescription"` //共创
CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
CooperationContractId int `json:"cooperationContractId,string"` // 共创合约id
CooperationContractDescription string `json:"cooperationContractDescription"` //共创
// CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号,
DepartmentId string `json:"departmentId"` // 共创合约发起部门id
CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象,1员工,2共创用户,3公开
... ...
... ... @@ -51,10 +51,10 @@ type CreditAccount struct {
//支付账期结算
type (
ReqCreditAccountsPay struct {
CreditAccountId int `json:"creditAccountId,string"`
ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际支付金额
Remarks string `json:"remarks"`
Attachment domain.Attachment `json:"paymentDocumentAttachment"` //附件
CreditAccountId int `json:"creditAccountId,string"`
ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际支付金额
Remarks string `json:"remarks"`
Attachment []domain.Attachment `json:"paymentDocumentAttachment"` //附件
}
DataCreditAccountsPay struct {
... ...