diff --git a/cmd/internal/dao/contract.go b/cmd/internal/dao/contract.go index 656513a..e718feb 100644 --- a/cmd/internal/dao/contract.go +++ b/cmd/internal/dao/contract.go @@ -123,6 +123,7 @@ func CreateStatementContract(tx *gorm.DB, artistUid, batchUid, batchTime string, Uid: uid.String(), ArtistUid: artistUid, Type: contractType, + Status: 0, BatchTime: batchTime, BatchUid: batchUid, } diff --git a/cmd/model/contract.go b/cmd/model/contract.go index 35917a4..149807e 100644 --- a/cmd/model/contract.go +++ b/cmd/model/contract.go @@ -14,7 +14,7 @@ type Contract struct { ViewUrl string `gorm:"column:view_url;type:varchar(500);comment:在线查看合同链接" json:"view_url"` DownloadUrl string `gorm:"column:download_url;type:varchar(500);comment:合同下载链接" json:"download_url"` State int32 `gorm:"column:state;default:1;type:int(1);comment:合同状态,1:未签署2:已签署;NOT NULL" json:"state"` //1 未签署 2 已签署 - Status int32 `gorm:"column:status;default:2;comment:2=锁定 3=解锁" json:"status" ` //跟随用户的锁定和解锁状态,用于控制数据的展示 + Status int32 `gorm:"column:status;default:2;comment:2=锁定 3=解锁 0=合同和锁定无关" json:"status" ` //跟随用户的锁定和解锁状态,用于控制数据的展示 LockTime string `gorm:"column:lock_time;comment:锁定时间" json:"lockTime"` SignTime string `gorm:"column:sign_time;comment:签署时间" json:"sign_time"` BatchTime string `gorm:"column:batch_time;comment:批次时间" json:"batch_time"` diff --git a/pb/artistinfoStatement.proto b/pb/artistinfoStatement.proto deleted file mode 100644 index 7e98aa9..0000000 --- a/pb/artistinfoStatement.proto +++ /dev/null @@ -1,122 +0,0 @@ -syntax = "proto3"; -package artistinfo; -option go_package = "./;artistinfoStatement"; - -//import "validate.proto"; -import public "google/protobuf/timestamp.proto"; -import "google/protobuf/empty.proto"; //使用 google.protobuf.Empty - -// protoc -I . -I ./pb --proto_path=. --go_out=./pb/artistinfoStatement --go-triple_out=./pb/artistinfoStatement --validate_out="lang=go:./pb/artistinfoStatement" ./pb/artistinfoStatement.proto -service Statement { - rpc CreateOrUpdateStatementBatch(StatementBatchRequest)returns(CreateStatementBatchResponse){}; //创建或更新对账单,包括更新委托明细和销售明细 - rpc BatchCreateStatementBatch(BatchCreateStatementBatchRequest)returns(google.protobuf.Empty){}; //批量创建对账单批次 - rpc GetStatementBatchList(GetStatementBatchListRequest)returns(GetStatementBatchListResponse){}; //批量查询对账单批次 - rpc GetStatementBatchTimeMenus(GetStatementBatchListRequest)returns(GetStatementBatchTimeMenusResponse){}; //获取对账单批次时间菜单列表 - - rpc CreateStatementDetail(StatementDetailRequest)returns(CreateStatementDetailResponse){};//创建对账单详情 - rpc BatchCreateStatementDetail(BatchCreateStatementDetailRequest)returns(google.protobuf.Empty){};//批量创建对账单详情 - rpc GetStatementDetailList(GetStatementDetailListRequest)returns(GetStatementDetailListResponse){};//查询对账单详情列表 -} - -message StatementPageInfo{ - int64 page =1; - int64 pageSize =2; - int64 total=3; -} - -enum StatementCreateType{ - saveEntrust=0; - saveSalse=1; -} -message StatementBatchRequest{ // 字段注释请查看对账单结构体模型 cmd/model/artworkStatement.go - string artistUid=1; - string artistName=2; - string aatchTime=3; - int32 flowStatus=4; - StatementCreateType updateType=5; - repeated EntrustRequest entrustList=6; - repeated SalesRequest salesList=7; -} -message EntrustRequest{ - string tfNum =1; - string artworkName =2; - string ruler =3; - string saleNo =4; - string completeDate =5; - float minPrice =6; - float guaranteePrice =7; -} -message SalesRequest { - string tfNum =1; - string artworkName =2; - string ruler =3; - string saleNo =4; - string completeDate =5; -} - -message StatementBatchInfo{ // 字段注释请查看对账单结构体模型 cmd/model/artworkStatement.go - // int32 stType=1; - string artistUid=2; - string artistName=3; - int32 flowStatus=4; - string batchTime=5; - float guaranteePrice=7; - int64 id = 8; - string createdAt =9; - string updatedAt =10; - int64 deletedAt =11; -} -message CreateStatementBatchResponse{ - int64 id =1; -} -message BatchCreateStatementBatchRequest{ - repeated StatementBatchRequest data =1; -} - - -message StatementDetailRequest{ - int64 batchId = 1; //字段注释请查看对账单结构体模型 cmd/model/artworkStatement.go - string tfNum = 2; - string artworkName =3; - string ruler = 4; - string saleNo = 5; - string completeDate = 6; - int64 id = 8; - string createdAt=9; - string updatedAt=10; - int64 deletedAt=11; -} -message CreateStatementDetailResponse{ - int64 id=1; -} -message BatchCreateStatementDetailRequest{ - repeated StatementDetailRequest data =1; -} - -message GetStatementBatchListRequest{ - StatementBatchRequest condition=1; - int64 page =2; - int64 pageSize =3; - repeated int64 ids =4; - repeated string batchTimeList =5; -} -message GetStatementBatchListResponse{ - repeated StatementBatchRequest data=1; - StatementPageInfo page =2; -} - - -message GetStatementDetailListRequest{ - StatementDetailRequest condition=1; //通用条件 - int64 page =2; - int64 pageSize =3; -} - -message GetStatementDetailListResponse{ - repeated StatementDetailRequest data=1; - StatementPageInfo page =2; -} - -message GetStatementBatchTimeMenusResponse{ - repeated string data=1; -} \ No newline at end of file