diff --git a/cmd/internal/dao/statement.go b/cmd/internal/dao/statement.go index df515cf..9ece648 100644 --- a/cmd/internal/dao/statement.go +++ b/cmd/internal/dao/statement.go @@ -59,3 +59,13 @@ func GetArtworkTxDetailByBatchUid(batchUid string) (artworkTxDetail []model.Artw return } + +func GetArtworkSoldTxDetailByBatchUid(batchUid string) (artworkSoldTxDetail []model.ArtworkSoldTxDetail, err error) { + if err = db.DB.Where("batch_uid = ?", batchUid).Find(&artworkSoldTxDetail).Error; err != nil { + zap.L().Error("get artworkSoldTxDetail infos err", zap.Error(err)) + err = errors.New(m.ERROR_SELECT) + return + } + + return +} diff --git a/cmd/internal/logic/statement.go b/cmd/internal/logic/statement.go index fe09b11..9d40a34 100644 --- a/cmd/internal/logic/statement.go +++ b/cmd/internal/logic/statement.go @@ -53,20 +53,40 @@ func (a *Statement) GetTxInfoByBatchUid(req *statement.GetTxInfoByBatchUidReques //获取物权画作详细信息 artworkTxDetails, err := dao.GetArtworkTxDetailByBatchUid(req.BatchUid) + if err != nil { + return + } + rep.ArtistName = artworkTx.ArtistName + + //获取物权画作被售卖详细信息 + artworkSoldTxDetails, err := dao.GetArtworkSoldTxDetailByBatchUid(req.BatchUid) + if err != nil { + return + } artworkTxDetail := new(statement.ArtworkTxDetail) + artworkSoldTxDetail := new(statement.ArtworkSoldTxDetail) for _, v := range artworkTxDetails { artworkTxDetail.TfNum = v.TfNum artworkTxDetail.ArtworkName = v.ArtworkName artworkTxDetail.Ruler = v.Ruler - artworkTxDetail.SaleNo = v.SaleNo - artworkTxDetail.CompleteDate = v.CompleteDate artworkTxDetail.MinPrice = v.MinPrice - artworkTxDetail.SalePrice = v.SalePrice artworkTxDetail.GuaranteePrice = v.GuaranteePrice rep.ArtworkTxDetail = append(rep.ArtworkTxDetail, artworkTxDetail) } + for _, v := range artworkSoldTxDetails { + artworkSoldTxDetail.TfNum = v.TfNum + artworkSoldTxDetail.ArtworkName = v.ArtworkName + artworkSoldTxDetail.Ruler = v.Ruler + artworkSoldTxDetail.SaleNo = v.SaleNo + artworkSoldTxDetail.CompleteDate = v.CompleteDate + artworkSoldTxDetail.MinPrice = v.MinPrice + artworkSoldTxDetail.SalePrice = v.SalePrice + artworkSoldTxDetail.GuaranteePrice = v.GuaranteePrice + rep.ArtworkSoldTxDetail = append(rep.ArtworkSoldTxDetail, artworkSoldTxDetail) + } + return } diff --git a/cmd/model/contract.go b/cmd/model/contract.go index 00eee13..4f7cf5d 100644 --- a/cmd/model/contract.go +++ b/cmd/model/contract.go @@ -4,25 +4,26 @@ import "gorm.io/plugin/soft_delete" // Contract 用户模型 type Contract struct { - ID int32 `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` - Uid string `gorm:"column:uid;type:varchar(100);comment:合同表的唯一表示;NOT NULL" json:"uid"` - ArtistUid string `gorm:"column:artist_uid;type:varchar(100);comment:画家uid;NOT NULL" json:"artist_uid"` - ArtworkUid string `gorm:"column:artwork_uid;type:varchar(1000);comment:画作uid" json:"artwork_uid"` - ContractId string `gorm:"column:contract_id;type:varchar(300);comment:合同id" json:"contract_id"` - TransactionId string `gorm:"column:transaction_id;type:varchar(300);comment:交易id" json:"transaction_id"` - Type int32 `gorm:"column:type;type:int(1);comment:合同类型 (1);NOT NULL" json:"type"` - 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;type:int(1);comment:合同状态,1:未签署2:已签署;NOT NULL" json:"state"` //1 未签署 2 已签署 - Status int32 `gorm:"column:status;default:2;comment:2=锁定 3=解锁" json:"status" ` //跟随用户的锁定和解锁状态,用于控制数据的展示 - LockTime string `gorm:"column:lock_time;comment:锁定时间" json:"lockTime"` - SignTime string `gorm:"column:sign_time;comment:签署时间" json:"sign_time"` - BatchName string `gorm:"column:batch_name;comment:批次名" json:"batch_name"` - BatchUid string `gorm:"column:batch_uid;comment:批次ID" json:"batch_uid"` - StType int32 `gorm:"column:st_type;unqiueIndex:sttype_uid_batchtime_idx;comment:对账单类型 1=版权 2=物权;"` - ArtworkTx *ArtworkTx `gorm:"foreignKey:BatchUid;references:Uid"` //当前批次的物权委托单 - ArtworkTxDetail []ArtworkTxDetail `gorm:"foreignKey:BatchUid;references:BatchUid"` //当前批次的物权委托单详情 - CreatedAt int32 `gorm:"column:created_at;autoCreateTime"` - UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"` - DeletedAt soft_delete.DeletedAt + ID int32 `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` + Uid string `gorm:"column:uid;type:varchar(100);comment:合同表的唯一表示;NOT NULL" json:"uid"` + ArtistUid string `gorm:"column:artist_uid;type:varchar(100);comment:画家uid;NOT NULL" json:"artist_uid"` + ArtworkUid string `gorm:"column:artwork_uid;type:varchar(1000);comment:画作uid" json:"artwork_uid"` + ContractId string `gorm:"column:contract_id;type:varchar(300);comment:合同id" json:"contract_id"` + TransactionId string `gorm:"column:transaction_id;type:varchar(300);comment:交易id" json:"transaction_id"` + Type int32 `gorm:"column:type;type:int(1);comment:合同类型 (1);NOT NULL" json:"type"` + 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;type:int(1);comment:合同状态,1:未签署2:已签署;NOT NULL" json:"state"` //1 未签署 2 已签署 + Status int32 `gorm:"column:status;default:2;comment:2=锁定 3=解锁" json:"status" ` //跟随用户的锁定和解锁状态,用于控制数据的展示 + LockTime string `gorm:"column:lock_time;comment:锁定时间" json:"lockTime"` + SignTime string `gorm:"column:sign_time;comment:签署时间" json:"sign_time"` + BatchName string `gorm:"column:batch_name;comment:批次名" json:"batch_name"` + BatchUid string `gorm:"column:batch_uid;comment:批次ID" json:"batch_uid"` + StType int32 `gorm:"column:st_type;unqiueIndex:sttype_uid_batchtime_idx;comment:对账单类型 1=版权 2=物权;"` + ArtworkTx *ArtworkTx `gorm:"foreignKey:BatchUid;references:Uid"` //当前批次的物权委托单 + ArtworkTxDetail []ArtworkTxDetail `gorm:"foreignKey:BatchUid;references:BatchUid"` //当前批次的物权委托单详情 + ArtworkSoldTxDetail []ArtworkSoldTxDetail `gorm:"foreignKey:BatchUid;references:BatchUid"` //当前批次的已被售卖物权委托单详情 + CreatedAt int32 `gorm:"column:created_at;autoCreateTime"` + UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"` + DeletedAt soft_delete.DeletedAt } diff --git a/cmd/model/statement.go b/cmd/model/statement.go index 4fbc2ce..b2edf6a 100644 --- a/cmd/model/statement.go +++ b/cmd/model/statement.go @@ -5,7 +5,7 @@ import "gorm.io/plugin/soft_delete" //对账单画作物权 type ArtworkTx struct { ID int32 `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` - Uid string `gorm:"column:uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次BatchUid;NOT NULL" json:"uid"` + Uid string `gorm:"column:uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次Uid;NOT NULL" json:"uid"` ArtistUid string `gorm:"column:artist_uid;type:varchar(100);comment:画家Uid;NOT NULL" json:"artist_uid"` ArtistName string `gorm:"column:artist_name;type:varchar(100);comment:画家名;NOT NULL" json:"artist_name"` BatchName string `gorm:"column:batch_name;comment:批次名" json:"batch_name"` @@ -14,11 +14,26 @@ type ArtworkTx struct { DeletedAt soft_delete.DeletedAt } -// 对账单画作物权委托详情 +// 对账单画作物权委托详情（该画家一个批次的全部画作） type ArtworkTxDetail struct { ID int32 `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` Uid string `gorm:"column:uid;type:varchar(100);comment:对账单画作物权详情表的唯一表示;NOT NULL" json:"uid"` - BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次BatchUid;NOT NULL" json:"batch_uid"` + BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次Uid;NOT NULL" json:"batch_uid"` + TfNum string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号"` + ArtworkName string `gorm:"column:artwork_name;comment:画作名称"` + Ruler string `gorm:"column:ruler;comment:平尺"` + MinPrice float32 `gorm:"column:min_price;comment:委托销售底价"` + GuaranteePrice float32 `gorm:"column:guarantee_price;comment:已收取保证金;"` + CreatedAt int32 `gorm:"column:created_at;autoCreateTime"` + UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"` + DeletedAt soft_delete.DeletedAt +} + +// 对账单画作物权委托详情(该画家一个批次的全部已被售卖了的画作) +type ArtworkSoldTxDetail struct { + ID int32 `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` + Uid string `gorm:"column:uid;type:varchar(100);comment:对账单画作物权详情表的唯一表示;NOT NULL" json:"uid"` + BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次Uid;NOT NULL" json:"batch_uid"` TfNum string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号"` ArtworkName string `gorm:"column:artwork_name;comment:画作名称"` Ruler string `gorm:"column:ruler;comment:平尺"` diff --git a/pb/artistinfoStatement/statement.pb.go b/pb/artistinfoStatement/statement.pb.go index f4c484d..89a85dc 100644 --- a/pb/artistinfoStatement/statement.pb.go +++ b/pb/artistinfoStatement/statement.pb.go @@ -196,11 +196,8 @@ type ArtworkTxDetail struct { TfNum string `protobuf:"bytes,2,opt,name=TfNum,proto3" json:"TfNum,omitempty"` ArtworkName string `protobuf:"bytes,3,opt,name=ArtworkName,json=artwork_name,proto3" json:"ArtworkName,omitempty"` Ruler string `protobuf:"bytes,4,opt,name=Ruler,json=ruler,proto3" json:"Ruler,omitempty"` - SaleNo string `protobuf:"bytes,5,opt,name=SaleNo,json=sale_no,proto3" json:"SaleNo,omitempty"` - CompleteDate string `protobuf:"bytes,6,opt,name=CompleteDate,json=complete_date,proto3" json:"CompleteDate,omitempty"` - MinPrice float32 `protobuf:"fixed32,7,opt,name=MinPrice,json=min_price,proto3" json:"MinPrice,omitempty"` - SalePrice float32 `protobuf:"fixed32,8,opt,name=SalePrice,json=sale_price,proto3" json:"SalePrice,omitempty"` - GuaranteePrice float32 `protobuf:"fixed32,9,opt,name=GuaranteePrice,json=guarantee_price,proto3" json:"GuaranteePrice,omitempty"` + MinPrice float32 `protobuf:"fixed32,5,opt,name=MinPrice,json=min_price,proto3" json:"MinPrice,omitempty"` + GuaranteePrice float32 `protobuf:"fixed32,6,opt,name=GuaranteePrice,json=guarantee_price,proto3" json:"GuaranteePrice,omitempty"` } func (x *ArtworkTxDetail) Reset() { @@ -263,20 +260,6 @@ func (x *ArtworkTxDetail) GetRuler() string { return "" } -func (x *ArtworkTxDetail) GetSaleNo() string { - if x != nil { - return x.SaleNo - } - return "" -} - -func (x *ArtworkTxDetail) GetCompleteDate() string { - if x != nil { - return x.CompleteDate - } - return "" -} - func (x *ArtworkTxDetail) GetMinPrice() float32 { if x != nil { return x.MinPrice @@ -284,14 +267,118 @@ func (x *ArtworkTxDetail) GetMinPrice() float32 { return 0 } -func (x *ArtworkTxDetail) GetSalePrice() float32 { +func (x *ArtworkTxDetail) GetGuaranteePrice() float32 { + if x != nil { + return x.GuaranteePrice + } + return 0 +} + +type ArtworkSoldTxDetail struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + BatchUid string `protobuf:"bytes,1,opt,name=BatchUid,json=batch_uid,proto3" json:"BatchUid,omitempty"` + TfNum string `protobuf:"bytes,2,opt,name=TfNum,proto3" json:"TfNum,omitempty"` + ArtworkName string `protobuf:"bytes,3,opt,name=ArtworkName,json=artwork_name,proto3" json:"ArtworkName,omitempty"` + Ruler string `protobuf:"bytes,4,opt,name=Ruler,json=ruler,proto3" json:"Ruler,omitempty"` + SaleNo string `protobuf:"bytes,5,opt,name=SaleNo,json=sale_no,proto3" json:"SaleNo,omitempty"` + CompleteDate string `protobuf:"bytes,6,opt,name=CompleteDate,json=complete_date,proto3" json:"CompleteDate,omitempty"` + MinPrice float32 `protobuf:"fixed32,7,opt,name=MinPrice,json=min_price,proto3" json:"MinPrice,omitempty"` + SalePrice float32 `protobuf:"fixed32,8,opt,name=SalePrice,json=sale_price,proto3" json:"SalePrice,omitempty"` + GuaranteePrice float32 `protobuf:"fixed32,9,opt,name=GuaranteePrice,json=guarantee_price,proto3" json:"GuaranteePrice,omitempty"` +} + +func (x *ArtworkSoldTxDetail) Reset() { + *x = ArtworkSoldTxDetail{} + if protoimpl.UnsafeEnabled { + mi := &file_statement_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ArtworkSoldTxDetail) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ArtworkSoldTxDetail) ProtoMessage() {} + +func (x *ArtworkSoldTxDetail) ProtoReflect() protoreflect.Message { + mi := &file_statement_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ArtworkSoldTxDetail.ProtoReflect.Descriptor instead. +func (*ArtworkSoldTxDetail) Descriptor() ([]byte, []int) { + return file_statement_proto_rawDescGZIP(), []int{2} +} + +func (x *ArtworkSoldTxDetail) GetBatchUid() string { + if x != nil { + return x.BatchUid + } + return "" +} + +func (x *ArtworkSoldTxDetail) GetTfNum() string { + if x != nil { + return x.TfNum + } + return "" +} + +func (x *ArtworkSoldTxDetail) GetArtworkName() string { + if x != nil { + return x.ArtworkName + } + return "" +} + +func (x *ArtworkSoldTxDetail) GetRuler() string { + if x != nil { + return x.Ruler + } + return "" +} + +func (x *ArtworkSoldTxDetail) GetSaleNo() string { + if x != nil { + return x.SaleNo + } + return "" +} + +func (x *ArtworkSoldTxDetail) GetCompleteDate() string { + if x != nil { + return x.CompleteDate + } + return "" +} + +func (x *ArtworkSoldTxDetail) GetMinPrice() float32 { + if x != nil { + return x.MinPrice + } + return 0 +} + +func (x *ArtworkSoldTxDetail) GetSalePrice() float32 { if x != nil { return x.SalePrice } return 0 } -func (x *ArtworkTxDetail) GetGuaranteePrice() float32 { +func (x *ArtworkSoldTxDetail) GetGuaranteePrice() float32 { if x != nil { return x.GuaranteePrice } @@ -312,7 +399,7 @@ type StatementListRequest struct { func (x *StatementListRequest) Reset() { *x = StatementListRequest{} if protoimpl.UnsafeEnabled { - mi := &file_statement_proto_msgTypes[2] + mi := &file_statement_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -325,7 +412,7 @@ func (x *StatementListRequest) String() string { func (*StatementListRequest) ProtoMessage() {} func (x *StatementListRequest) ProtoReflect() protoreflect.Message { - mi := &file_statement_proto_msgTypes[2] + mi := &file_statement_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -338,7 +425,7 @@ func (x *StatementListRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use StatementListRequest.ProtoReflect.Descriptor instead. func (*StatementListRequest) Descriptor() ([]byte, []int) { - return file_statement_proto_rawDescGZIP(), []int{2} + return file_statement_proto_rawDescGZIP(), []int{3} } func (x *StatementListRequest) GetArtistUid() string { @@ -381,7 +468,7 @@ type StatementListRespond struct { func (x *StatementListRespond) Reset() { *x = StatementListRespond{} if protoimpl.UnsafeEnabled { - mi := &file_statement_proto_msgTypes[3] + mi := &file_statement_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -394,7 +481,7 @@ func (x *StatementListRespond) String() string { func (*StatementListRespond) ProtoMessage() {} func (x *StatementListRespond) ProtoReflect() protoreflect.Message { - mi := &file_statement_proto_msgTypes[3] + mi := &file_statement_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -407,7 +494,7 @@ func (x *StatementListRespond) ProtoReflect() protoreflect.Message { // Deprecated: Use StatementListRespond.ProtoReflect.Descriptor instead. func (*StatementListRespond) Descriptor() ([]byte, []int) { - return file_statement_proto_rawDescGZIP(), []int{3} + return file_statement_proto_rawDescGZIP(), []int{4} } func (x *StatementListRespond) GetData() []*Contracts { @@ -435,7 +522,7 @@ type CreateTxContractRequest struct { func (x *CreateTxContractRequest) Reset() { *x = CreateTxContractRequest{} if protoimpl.UnsafeEnabled { - mi := &file_statement_proto_msgTypes[4] + mi := &file_statement_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -448,7 +535,7 @@ func (x *CreateTxContractRequest) String() string { func (*CreateTxContractRequest) ProtoMessage() {} func (x *CreateTxContractRequest) ProtoReflect() protoreflect.Message { - mi := &file_statement_proto_msgTypes[4] + mi := &file_statement_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -461,7 +548,7 @@ func (x *CreateTxContractRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateTxContractRequest.ProtoReflect.Descriptor instead. func (*CreateTxContractRequest) Descriptor() ([]byte, []int) { - return file_statement_proto_rawDescGZIP(), []int{4} + return file_statement_proto_rawDescGZIP(), []int{5} } func (x *CreateTxContractRequest) GetBatchUid() string { @@ -482,7 +569,7 @@ type CreateTxContractRespond struct { func (x *CreateTxContractRespond) Reset() { *x = CreateTxContractRespond{} if protoimpl.UnsafeEnabled { - mi := &file_statement_proto_msgTypes[5] + mi := &file_statement_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -495,7 +582,7 @@ func (x *CreateTxContractRespond) String() string { func (*CreateTxContractRespond) ProtoMessage() {} func (x *CreateTxContractRespond) ProtoReflect() protoreflect.Message { - mi := &file_statement_proto_msgTypes[5] + mi := &file_statement_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -508,7 +595,7 @@ func (x *CreateTxContractRespond) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateTxContractRespond.ProtoReflect.Descriptor instead. func (*CreateTxContractRespond) Descriptor() ([]byte, []int) { - return file_statement_proto_rawDescGZIP(), []int{5} + return file_statement_proto_rawDescGZIP(), []int{6} } func (x *CreateTxContractRespond) GetMsg() string { @@ -529,7 +616,7 @@ type GetTxInfoByBatchUidRequest struct { func (x *GetTxInfoByBatchUidRequest) Reset() { *x = GetTxInfoByBatchUidRequest{} if protoimpl.UnsafeEnabled { - mi := &file_statement_proto_msgTypes[6] + mi := &file_statement_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -542,7 +629,7 @@ func (x *GetTxInfoByBatchUidRequest) String() string { func (*GetTxInfoByBatchUidRequest) ProtoMessage() {} func (x *GetTxInfoByBatchUidRequest) ProtoReflect() protoreflect.Message { - mi := &file_statement_proto_msgTypes[6] + mi := &file_statement_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -555,7 +642,7 @@ func (x *GetTxInfoByBatchUidRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetTxInfoByBatchUidRequest.ProtoReflect.Descriptor instead. func (*GetTxInfoByBatchUidRequest) Descriptor() ([]byte, []int) { - return file_statement_proto_rawDescGZIP(), []int{6} + return file_statement_proto_rawDescGZIP(), []int{7} } func (x *GetTxInfoByBatchUidRequest) GetBatchUid() string { @@ -570,15 +657,16 @@ type GetTxInfoByBatchUidRespond struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ArtistName string `protobuf:"bytes,1,opt,name=ArtistName,json=artist_name,proto3" json:"ArtistName,omitempty"` - ArtworkTxDetail []*ArtworkTxDetail `protobuf:"bytes,2,rep,name=ArtworkTxDetail,json=artwork_tx_detail,proto3" json:"ArtworkTxDetail,omitempty"` - Msg string `protobuf:"bytes,3,opt,name=Msg,json=msg,proto3" json:"Msg,omitempty"` + ArtistName string `protobuf:"bytes,1,opt,name=ArtistName,json=artist_name,proto3" json:"ArtistName,omitempty"` + ArtworkTxDetail []*ArtworkTxDetail `protobuf:"bytes,2,rep,name=ArtworkTxDetail,json=artwork_tx_detail,proto3" json:"ArtworkTxDetail,omitempty"` + ArtworkSoldTxDetail []*ArtworkSoldTxDetail `protobuf:"bytes,3,rep,name=ArtworkSoldTxDetail,json=artwork_sold_tx_detail,proto3" json:"ArtworkSoldTxDetail,omitempty"` + Msg string `protobuf:"bytes,4,opt,name=Msg,json=msg,proto3" json:"Msg,omitempty"` } func (x *GetTxInfoByBatchUidRespond) Reset() { *x = GetTxInfoByBatchUidRespond{} if protoimpl.UnsafeEnabled { - mi := &file_statement_proto_msgTypes[7] + mi := &file_statement_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -591,7 +679,7 @@ func (x *GetTxInfoByBatchUidRespond) String() string { func (*GetTxInfoByBatchUidRespond) ProtoMessage() {} func (x *GetTxInfoByBatchUidRespond) ProtoReflect() protoreflect.Message { - mi := &file_statement_proto_msgTypes[7] + mi := &file_statement_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -604,7 +692,7 @@ func (x *GetTxInfoByBatchUidRespond) ProtoReflect() protoreflect.Message { // Deprecated: Use GetTxInfoByBatchUidRespond.ProtoReflect.Descriptor instead. func (*GetTxInfoByBatchUidRespond) Descriptor() ([]byte, []int) { - return file_statement_proto_rawDescGZIP(), []int{7} + return file_statement_proto_rawDescGZIP(), []int{8} } func (x *GetTxInfoByBatchUidRespond) GetArtistName() string { @@ -621,6 +709,13 @@ func (x *GetTxInfoByBatchUidRespond) GetArtworkTxDetail() []*ArtworkTxDetail { return nil } +func (x *GetTxInfoByBatchUidRespond) GetArtworkSoldTxDetail() []*ArtworkSoldTxDetail { + if x != nil { + return x.ArtworkSoldTxDetail + } + return nil +} + func (x *GetTxInfoByBatchUidRespond) GetMsg() string { if x != nil { return x.Msg @@ -664,7 +759,7 @@ var file_statement_proto_rawDesc = []byte{ 0x55, 0x69, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0a, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, - 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xa0, 0x02, 0x0a, 0x0f, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xc3, 0x01, 0x0a, 0x0f, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x54, 0x78, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x1b, 0x0a, 0x08, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x66, 0x4e, 0x75, 0x6d, 0x18, @@ -672,70 +767,88 @@ var file_statement_proto_rawDesc = []byte{ 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x52, 0x75, 0x6c, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x72, 0x75, 0x6c, 0x65, 0x72, 0x12, 0x17, 0x0a, 0x06, 0x53, 0x61, 0x6c, 0x65, 0x4e, 0x6f, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x61, 0x6c, 0x65, 0x5f, 0x6e, 0x6f, 0x12, 0x23, - 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x61, 0x74, 0x65, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x64, - 0x61, 0x74, 0x65, 0x12, 0x1b, 0x0a, 0x08, 0x4d, 0x69, 0x6e, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x02, 0x52, 0x09, 0x6d, 0x69, 0x6e, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, - 0x12, 0x1d, 0x0a, 0x09, 0x53, 0x61, 0x6c, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x02, 0x52, 0x0a, 0x73, 0x61, 0x6c, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, - 0x27, 0x0a, 0x0e, 0x47, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x50, 0x72, 0x69, 0x63, - 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, - 0x65, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x7b, 0x0a, 0x14, 0x53, 0x74, 0x61, 0x74, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x1d, 0x0a, 0x09, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x5f, 0x75, 0x69, 0x64, 0x12, - 0x1a, 0x0a, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x50, - 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, - 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x52, 0x0a, 0x14, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x28, 0x0a, - 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x74, - 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, - 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x36, 0x0a, 0x17, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x54, 0x78, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x08, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x75, 0x69, - 0x64, 0x22, 0x2b, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x78, 0x43, 0x6f, 0x6e, - 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, - 0x4d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x39, - 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x54, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x42, 0x61, 0x74, - 0x63, 0x68, 0x55, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x08, - 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x75, 0x69, 0x64, 0x22, 0x97, 0x01, 0x0a, 0x1a, 0x47, 0x65, + 0x72, 0x75, 0x6c, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x08, 0x4d, 0x69, 0x6e, 0x50, 0x72, 0x69, 0x63, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x02, 0x52, 0x09, 0x6d, 0x69, 0x6e, 0x5f, 0x70, 0x72, 0x69, + 0x63, 0x65, 0x12, 0x27, 0x0a, 0x0e, 0x47, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x50, + 0x72, 0x69, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x67, 0x75, 0x61, 0x72, + 0x61, 0x6e, 0x74, 0x65, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0xa4, 0x02, 0x0a, 0x13, + 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x6f, 0x6c, 0x64, 0x54, 0x78, 0x44, 0x65, 0x74, + 0x61, 0x69, 0x6c, 0x12, 0x1b, 0x0a, 0x08, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x75, 0x69, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x54, 0x66, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x54, 0x66, 0x4e, 0x75, 0x6d, 0x12, 0x21, 0x0a, 0x0b, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x72, 0x74, + 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x52, 0x75, 0x6c, + 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x72, 0x12, + 0x17, 0x0a, 0x06, 0x53, 0x61, 0x6c, 0x65, 0x4e, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x73, 0x61, 0x6c, 0x65, 0x5f, 0x6e, 0x6f, 0x12, 0x23, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x44, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, + 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x12, 0x1b, 0x0a, + 0x08, 0x4d, 0x69, 0x6e, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x02, 0x52, + 0x09, 0x6d, 0x69, 0x6e, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1d, 0x0a, 0x09, 0x53, 0x61, + 0x6c, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0a, 0x73, + 0x61, 0x6c, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x27, 0x0a, 0x0e, 0x47, 0x75, 0x61, + 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, + 0x02, 0x52, 0x0f, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x5f, 0x70, 0x72, 0x69, + 0x63, 0x65, 0x22, 0x7b, 0x0a, 0x14, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4c, + 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x09, 0x41, 0x72, + 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, + 0x72, 0x74, 0x69, 0x73, 0x74, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x61, 0x67, + 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, + 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, + 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, + 0x52, 0x0a, 0x14, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, + 0x61, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x6d, 0x73, 0x67, 0x22, 0x36, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x78, 0x43, + 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, + 0x0a, 0x08, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x75, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x17, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x78, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x39, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x54, + 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x08, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, + 0x75, 0x69, 0x64, 0x22, 0xec, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x54, 0x78, 0x49, 0x6e, 0x66, + 0x6f, 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x64, 0x12, 0x1f, 0x0a, 0x0a, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x12, 0x46, 0x0a, 0x0f, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x54, 0x78, + 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, + 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x54, 0x78, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x11, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x5f, 0x74, 0x78, 0x5f, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x53, 0x0a, 0x13, 0x41, + 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x6f, 0x6c, 0x64, 0x54, 0x78, 0x44, 0x65, 0x74, 0x61, + 0x69, 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x6f, 0x6c, 0x64, + 0x54, 0x78, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x16, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x5f, 0x73, 0x6f, 0x6c, 0x64, 0x5f, 0x74, 0x78, 0x5f, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, + 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, + 0x73, 0x67, 0x32, 0xa5, 0x02, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x12, 0x53, 0x0a, 0x0d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, + 0x74, 0x12, 0x1f, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x5c, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, + 0x78, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x22, 0x2e, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x78, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, + 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x54, 0x78, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x64, 0x22, 0x00, 0x12, 0x65, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x54, 0x78, 0x49, 0x6e, 0x66, 0x6f, + 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x12, 0x25, 0x2e, 0x73, 0x74, 0x61, + 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x78, 0x49, 0x6e, 0x66, 0x6f, + 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x25, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, - 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x1f, 0x0a, 0x0a, 0x41, 0x72, 0x74, 0x69, - 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, - 0x74, 0x69, 0x73, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x46, 0x0a, 0x0f, 0x41, 0x72, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x54, 0x78, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x41, - 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x54, 0x78, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x11, - 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x74, 0x78, 0x5f, 0x64, 0x65, 0x74, 0x61, 0x69, - 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6d, 0x73, 0x67, 0x32, 0xa5, 0x02, 0x0a, 0x09, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x12, 0x53, 0x0a, 0x0d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x69, - 0x73, 0x74, 0x12, 0x1f, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, - 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x5c, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x54, 0x78, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x22, 0x2e, 0x73, 0x74, 0x61, - 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x78, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, - 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x54, 0x78, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x64, 0x22, 0x00, 0x12, 0x65, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x54, 0x78, 0x49, 0x6e, 0x66, - 0x6f, 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x12, 0x25, 0x2e, 0x73, 0x74, - 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x78, 0x49, 0x6e, 0x66, - 0x6f, 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x47, - 0x65, 0x74, 0x54, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x55, - 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, - 0x2f, 0x3b, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2f, + 0x3b, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -750,31 +863,33 @@ func file_statement_proto_rawDescGZIP() []byte { return file_statement_proto_rawDescData } -var file_statement_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_statement_proto_msgTypes = make([]protoimpl.MessageInfo, 9) var file_statement_proto_goTypes = []interface{}{ (*Contracts)(nil), // 0: statement.Contracts (*ArtworkTxDetail)(nil), // 1: statement.ArtworkTxDetail - (*StatementListRequest)(nil), // 2: statement.StatementListRequest - (*StatementListRespond)(nil), // 3: statement.StatementListRespond - (*CreateTxContractRequest)(nil), // 4: statement.CreateTxContractRequest - (*CreateTxContractRespond)(nil), // 5: statement.CreateTxContractRespond - (*GetTxInfoByBatchUidRequest)(nil), // 6: statement.GetTxInfoByBatchUidRequest - (*GetTxInfoByBatchUidRespond)(nil), // 7: statement.GetTxInfoByBatchUidRespond + (*ArtworkSoldTxDetail)(nil), // 2: statement.ArtworkSoldTxDetail + (*StatementListRequest)(nil), // 3: statement.StatementListRequest + (*StatementListRespond)(nil), // 4: statement.StatementListRespond + (*CreateTxContractRequest)(nil), // 5: statement.CreateTxContractRequest + (*CreateTxContractRespond)(nil), // 6: statement.CreateTxContractRespond + (*GetTxInfoByBatchUidRequest)(nil), // 7: statement.GetTxInfoByBatchUidRequest + (*GetTxInfoByBatchUidRespond)(nil), // 8: statement.GetTxInfoByBatchUidRespond } var file_statement_proto_depIdxs = []int32{ 0, // 0: statement.StatementListRespond.Data:type_name -> statement.Contracts 1, // 1: statement.GetTxInfoByBatchUidRespond.ArtworkTxDetail:type_name -> statement.ArtworkTxDetail - 2, // 2: statement.Statement.StatementList:input_type -> statement.StatementListRequest - 4, // 3: statement.Statement.CreateTxContract:input_type -> statement.CreateTxContractRequest - 6, // 4: statement.Statement.GetTxInfoByBatchUid:input_type -> statement.GetTxInfoByBatchUidRequest - 3, // 5: statement.Statement.StatementList:output_type -> statement.StatementListRespond - 5, // 6: statement.Statement.CreateTxContract:output_type -> statement.CreateTxContractRespond - 7, // 7: statement.Statement.GetTxInfoByBatchUid:output_type -> statement.GetTxInfoByBatchUidRespond - 5, // [5:8] is the sub-list for method output_type - 2, // [2:5] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 2, // 2: statement.GetTxInfoByBatchUidRespond.ArtworkSoldTxDetail:type_name -> statement.ArtworkSoldTxDetail + 3, // 3: statement.Statement.StatementList:input_type -> statement.StatementListRequest + 5, // 4: statement.Statement.CreateTxContract:input_type -> statement.CreateTxContractRequest + 7, // 5: statement.Statement.GetTxInfoByBatchUid:input_type -> statement.GetTxInfoByBatchUidRequest + 4, // 6: statement.Statement.StatementList:output_type -> statement.StatementListRespond + 6, // 7: statement.Statement.CreateTxContract:output_type -> statement.CreateTxContractRespond + 8, // 8: statement.Statement.GetTxInfoByBatchUid:output_type -> statement.GetTxInfoByBatchUidRespond + 6, // [6:9] is the sub-list for method output_type + 3, // [3:6] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_statement_proto_init() } @@ -808,7 +923,7 @@ func file_statement_proto_init() { } } file_statement_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StatementListRequest); i { + switch v := v.(*ArtworkSoldTxDetail); i { case 0: return &v.state case 1: @@ -820,7 +935,7 @@ func file_statement_proto_init() { } } file_statement_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StatementListRespond); i { + switch v := v.(*StatementListRequest); i { case 0: return &v.state case 1: @@ -832,7 +947,7 @@ func file_statement_proto_init() { } } file_statement_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CreateTxContractRequest); i { + switch v := v.(*StatementListRespond); i { case 0: return &v.state case 1: @@ -844,7 +959,7 @@ func file_statement_proto_init() { } } file_statement_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CreateTxContractRespond); i { + switch v := v.(*CreateTxContractRequest); i { case 0: return &v.state case 1: @@ -856,7 +971,7 @@ func file_statement_proto_init() { } } file_statement_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetTxInfoByBatchUidRequest); i { + switch v := v.(*CreateTxContractRespond); i { case 0: return &v.state case 1: @@ -868,6 +983,18 @@ func file_statement_proto_init() { } } file_statement_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetTxInfoByBatchUidRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_statement_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetTxInfoByBatchUidRespond); i { case 0: return &v.state @@ -886,7 +1013,7 @@ func file_statement_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_statement_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 9, NumExtensions: 0, NumServices: 1, }, diff --git a/pb/artistinfoStatement/statement.proto b/pb/artistinfoStatement/statement.proto index af72935..1eb298a 100644 --- a/pb/artistinfoStatement/statement.proto +++ b/pb/artistinfoStatement/statement.proto @@ -28,6 +28,15 @@ message Contracts{ } message ArtworkTxDetail{ + string BatchUid = 1 [json_name = "batch_uid"]; + string TfNum = 2 [json_name = "TfNum"]; + string ArtworkName = 3 [json_name = "artwork_name"]; + string Ruler = 4 [json_name = "ruler"]; + float MinPrice = 5 [json_name = "min_price"]; + float GuaranteePrice = 6 [json_name = "guarantee_price"]; + } + + message ArtworkSoldTxDetail{ string BatchUid = 1 [json_name = "batch_uid"]; string TfNum = 2 [json_name = "TfNum"]; string ArtworkName = 3 [json_name = "artwork_name"]; @@ -66,5 +75,6 @@ message GetTxInfoByBatchUidRequest { message GetTxInfoByBatchUidRespond { string ArtistName = 1 [json_name = "artist_name"]; repeated ArtworkTxDetail ArtworkTxDetail = 2 [json_name = "artwork_tx_detail"]; - string Msg = 3 [json_name = "msg"]; + repeated ArtworkSoldTxDetail ArtworkSoldTxDetail = 3 [json_name = "artwork_sold_tx_detail"]; + string Msg = 4 [json_name = "msg"]; } \ No newline at end of file diff --git a/pb/artistinfoStatement/statement.validator.pb.go b/pb/artistinfoStatement/statement.validator.pb.go index 4b7654c..cfca7f9 100644 --- a/pb/artistinfoStatement/statement.validator.pb.go +++ b/pb/artistinfoStatement/statement.validator.pb.go @@ -21,6 +21,9 @@ func (this *Contracts) Validate() error { func (this *ArtworkTxDetail) Validate() error { return nil } +func (this *ArtworkSoldTxDetail) Validate() error { + return nil +} func (this *StatementListRequest) Validate() error { return nil } @@ -51,5 +54,12 @@ func (this *GetTxInfoByBatchUidRespond) Validate() error { } } } + for _, item := range this.ArtworkSoldTxDetail { + if item != nil { + if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil { + return github_com_mwitkow_go_proto_validators.FieldError("ArtworkSoldTxDetail", err) + } + } + } return nil }