Merge branch 'xjjdev'

.gitignore

@@ -33,4 +33,5 @@ yarn-error.log*
 
 /cmd/logs/*.log
 /cmd/runtime/log/*.log
-/build/*
+/build/*
+conf/conf.ini

DockerfileSlim

@@ -1,17 +1,14 @@
 FROM busybox:glibc
 
-ARG BUILD_DATE
-ENV BUILD_DATE ${BUILD_DATE}
 COPY ./docs/Shanghai /usr/share/zoneinfo/Asia/Shanghai
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
-
 #ENV TZ Asia/Shanghai
 
-WORKDIR /app
+WORKDIR /app/main-client
 #通过名称引用
-COPY  ./build/app /app/artistinfo-dev
+COPY  ./build/app ./bin/mainServer
 COPY  ./conf/ /app/conf/
 COPY  ./conf/ ./conf/
 
-# 在容器启动时输出环境变量BUILD_DATE的值
+WORKDIR /app/main-client/bin
-CMD ["/app/artistinfo-dev"]
+CMD ["./mainServer"]

cmd/app.go

@@ -21,7 +21,7 @@ func main() {
 	config.SetProviderService(&controller.ArtistInfoArtworkProvider{})
 	config.SetProviderService(&controller.ArtistInfoArtshowProvider{})
 	config.SetProviderService(&controller.ArtistInfoContractProvider{})
-	// config.SetConsumerService(&controller.StatementServerProvider{})
+	config.SetConsumerService(&controller.ArtistInfoStatementProvider{})
 	db.Init(m.SERVER_CONFIG)
 	cache.InitRedis(m.SERVER_CONFIG)
 	if err := config.Load(); err != nil {

cmd/internal/controller/statement.go

@@ -0,0 +1,38 @@
+package controller
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/fonchain/fonchain-artistinfo/cmd/internal/logic"
+	statement "github.com/fonchain/fonchain-artistinfo/pb/artistinfoStatement"
+)
+
+type ArtistInfoStatementProvider struct {
+	statement.UnimplementedStatementServer
+	statementLogic *logic.Statement
+}
+
+func (c *ArtistInfoStatementProvider) StatementList(ctx context.Context, req *statement.StatementListRequest) (rep *statement.StatementListRespond, err error) {
+	fmt.Println("第一处")
+	if rep, err = c.statementLogic.StatementList(req); err != nil {
+		return nil, err
+	}
+	return rep, nil
+}
+
+func (c *ArtistInfoStatementProvider) GetTxInfoByBatchUid(ctx context.Context, req *statement.GetTxInfoByBatchUidRequest) (rep *statement.GetTxInfoByBatchUidRespond, err error) {
+	fmt.Println("第一处")
+	if rep, err = c.statementLogic.GetTxInfoByBatchUid(req); err != nil {
+		return nil, err
+	}
+	return rep, nil
+}
+
+func (c *ArtistInfoStatementProvider) GetCopyInfoByBatchUid(ctx context.Context, req *statement.GetCopyInfoByBatchUidRequest) (rep *statement.GetCopyInfoByBatchUidRespond, err error) {
+	fmt.Println("第一处")
+	if rep, err = c.statementLogic.GetCopyInfoByBatchUid(req); err != nil {
+		return nil, err
+	}
+	return rep, nil
+}

cmd/internal/dao/artistInfo_user.go

@@ -1031,13 +1031,15 @@ func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *arti
 	var inviteRelationIds []int64
 	db.DB.Model(model.Invite{}).Where("BINARY invite_code = ?", in.InviterCode).Pluck("invited_id", &inviteRelationIds)
 	var invitedList []model.User
-	orm := db.DB.Select("sys_user.id,sys_user.created_at,sys_user.mgmt_acc_id,sys_user.mgmt_artist_uid,sys_user.tel_num,sys_user.invited_code,sys_user.account,sys_user.photo,sys_user.is_real_name,sys_user.fdd_state").Model(model.User{}).Preload("RealNameInfo").
+	//.Select("sys_user.id,sys_user.created_at,sys_user.mgmt_acc_id,sys_user.mgmt_artist_uid,sys_user.tel_num,sys_user.invited_code,sys_user.account,sys_user.photo,sys_user.is_real_name,sys_user.fdd_state")
+	orm := db.DB.Model(model.User{}).Preload("RealNameInfo").
 		Joins("LEFT JOIN real_name rn ON rn.id = sys_user.real_name_id").
 		Joins("LEFT JOIN invite ON invite.invited_id = sys_user.id").
-		Where("sys_user.id in ?", inviteRelationIds).Order("invite.created_at desc")
+		Where("sys_user.id in ?", inviteRelationIds).Order("invite.created_at desc").Where("sys_user.is_real_name=1")
 	if in.RealName != "" {
 		orm = orm.Where("rn.name like ?", "%"+in.RealName+"%")
 	}
+	fmt.Println("in.RealName", in.RealName)
 	if in.Keyword != "" {
 		searchWords := "%" + in.Keyword + "%"
 		orm = orm.Where("rn.name like ? OR sys_user.tel_num LIKE ? or sys_user.invited_code LIKE ?", searchWords, searchWords, searchWords)

cmd/internal/dao/contract.go

@@ -105,15 +105,15 @@ func GetArtistNoByUid(artistUid string) (err error) {
 	return
 }
 
-func GetContractList(artistUid string, pageSize, offset int32) (contracts []*contract.Contracts, err error) {
+func GetContractList(artistUid string, pageSize, offset, status int32) (contracts []*contract.Contracts, err error) {
 
 	var contractSlice []model.Contract
-	if err = db.DB.Where("artist_uid = ?", artistUid).Order("ID asc").Limit(int(pageSize)).Offset(int(offset)).Find(&contractSlice).Error; err != nil {
+	if err = db.DB.Where("artist_uid = ? AND status = ?", artistUid, status).Order("ID asc").Limit(int(pageSize)).Offset(int(offset)).Find(&contractSlice).Error; err != nil {
 		zap.L().Error("get contracts info err", zap.Error(err))
 		err = errors.New(m.CREATE_ERROR)
 		return
 	}
-	fmt.Println("第二处")
+
 	for _, v := range contractSlice {
 		contcontract := &contract.Contracts{
 			ContractUid:   v.Uid,
@@ -145,7 +145,7 @@ func GetArtistInfoById(artistUid string) (user model.User, err error) {
 	return
 }
 
-func ContractList(artist_uid string, state int32) (ContractData []*contract.Contracts, err error) {
+func ContractList(artist_uid string, state int32) (contractData []*contract.Contracts, err error) {
 
 	// if state != 0 {
 	// 	if state == 2 {
@@ -154,7 +154,7 @@ func ContractList(artist_uid string, state int32) (ContractData []*contract.Cont
 	// }
 
 	var contracts []model.Contract
-	if err = db.DB.Where("artist_uid = ?  AND type != 4 AND  state = ?", artist_uid, state).Find(&contracts).Error; err != nil {
+	if err = db.DB.Where("artist_uid = ?  AND type != 4 AND type != 7 AND  state = ?", artist_uid, state).Find(&contracts).Error; err != nil {
 		zap.L().Error("get contracts info err", zap.Error(err))
 		err = errors.New(m.ERROR_SELECT)
 		return
@@ -177,7 +177,7 @@ func ContractList(artist_uid string, state int32) (ContractData []*contract.Cont
 			SignTime:      v.SignTime,
 		}
 
-		ContractData = append(ContractData, Contract)
+		contractData = append(contractData, Contract)
 	}
 
 	return
@@ -193,12 +193,21 @@ func GetContractInfo(contractUid string) (contractInfo model.Contract, err error
 }
 
 func UpdateContract(tx *gorm.DB, req *contract.SignContractRequest) (err error) {
-	fmt.Println("第一处1111")
+	//对账单这边只有TransactionId需要改变
-	if err = tx.Model(&model.Contract{}).Where("uid = ?", req.ContractUid).Updates(model.Contract{ViewUrl: req.ViewPdfUrl, DownloadUrl: req.DownloadUrl, ContractId: req.ContractNo, TransactionId: req.TransactionId, State: 1}).Error; err != nil {
+	if req.ViewPdfUrl == "" {
-		zap.L().Error("update contract info err", zap.Error(err))
+		if err = tx.Model(&model.Contract{}).Where("uid = ?", req.ContractUid).Updates(model.Contract{TransactionId: req.TransactionId, State: 1}).Error; err != nil {
-		err = errors.New(m.UPDATE_FAILED)
+			zap.L().Error("update contract info err", zap.Error(err))
-		return
+			err = errors.New(m.UPDATE_FAILED)
+			return
+		}
+	} else {
+		if err = tx.Model(&model.Contract{}).Where("uid = ?", req.ContractUid).Updates(model.Contract{ViewUrl: req.ViewPdfUrl, DownloadUrl: req.DownloadUrl, ContractId: req.ContractNo, TransactionId: req.TransactionId, State: 1}).Error; err != nil {
+			zap.L().Error("update contract info err", zap.Error(err))
+			err = errors.New(m.UPDATE_FAILED)
+			return
+		}
 	}
+
 	return
 }
 

cmd/internal/dao/statement.go

@@ -0,0 +1,104 @@
+package dao
+
+import (
+	"errors"
+
+	"github.com/fonchain/fonchain-artistinfo/cmd/model"
+	statement "github.com/fonchain/fonchain-artistinfo/pb/artistinfoStatement"
+	db "github.com/fonchain/fonchain-artistinfo/pkg/db"
+	"github.com/fonchain/fonchain-artistinfo/pkg/m"
+	"go.uber.org/zap"
+)
+
+func StatementList(artistUid string, state int32) (contractData []*statement.Contracts, err error) {
+
+	var contracts []model.Contract
+	if err = db.DB.Where("artist_uid = ? AND  state = ?", artistUid, state).Where("type == 4 OR type == 7").Find(&contracts).Error; err != nil {
+		zap.L().Error("get contracts info err", zap.Error(err))
+		err = errors.New(m.ERROR_SELECT)
+		return
+	}
+
+	for _, v := range contracts {
+		Contract := &statement.Contracts{
+			ContractUid:   v.Uid,
+			ArtistUid:     v.ArtistUid,
+			ArtworkUid:    v.ArtworkUid,
+			ContractId:    v.ContractId,
+			TransactionId: v.TransactionId,
+			Type:          v.Type,
+			ViewUrl:       v.ViewUrl,
+			DownloadUrl:   v.DownloadUrl,
+			State:         v.State,
+			Status:        int32(v.Status),
+			LockTime:      v.LockTime,
+			SignTime:      v.SignTime,
+			BatchTime:     v.BatchTime,
+			BatchUid:      v.BatchUid,
+		}
+
+		contractData = append(contractData, Contract)
+	}
+
+	return
+}
+
+func GetTxArtistNameByBatchUid(batchUid string) (artworkTx model.ArtworkTx, err error) {
+	if err = db.DB.Where("uid = ?", batchUid).Find(&artworkTx).Error; err != nil {
+		zap.L().Error("get artworkTx info err", zap.Error(err))
+		err = errors.New(m.ERROR_SELECT)
+		return
+	}
+
+	return
+}
+
+func GetArtworkTxDetailByBatchUid(batchUid string) (artworkTxDetail []model.ArtworkTxDetail, err error) {
+	if err = db.DB.Where("batch_uid = ?", batchUid).Find(&artworkTxDetail).Error; err != nil {
+		zap.L().Error("get artworkTxDetail infos err", zap.Error(err))
+		err = errors.New(m.ERROR_SELECT)
+		return
+	}
+
+	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
+}
+
+func GetCopyArtistNameByBatchUid(batchUid string) (artworkCopy model.ArtworkCopy, err error) {
+	if err = db.DB.Where("uid = ?", batchUid).Find(&artworkCopy).Error; err != nil {
+		zap.L().Error("get artworkCopy info err", zap.Error(err))
+		err = errors.New(m.ERROR_SELECT)
+		return
+	}
+
+	return
+}
+
+func GetArtworkCopyDetailByBatchUid(batchUid string) (artworkCopyDetail []model.ArtworkCopyDetail, err error) {
+	if err = db.DB.Where("batch_uid = ?", batchUid).Find(&artworkCopyDetail).Error; err != nil {
+		zap.L().Error("get artworkCopyDetail infos err", zap.Error(err))
+		err = errors.New(m.ERROR_SELECT)
+		return
+	}
+
+	return
+}
+
+func GetArtworkSoldCopyDetailByBatchUid(batchUid string) (artworkSoldCopyDetail []model.ArtworkSoldCopyDetail, err error) {
+	if err = db.DB.Where("batch_uid = ?", batchUid).Find(&artworkSoldCopyDetail).Error; err != nil {
+		zap.L().Error("get artworkSoldCopyDetail infos err", zap.Error(err))
+		err = errors.New(m.ERROR_SELECT)
+		return
+	}
+
+	return
+}

cmd/internal/logic/contract.go

@@ -174,7 +174,7 @@ func (a *Contract) ContractListMgmt(req *contract.ContractListMgmtRequest) (rep
 	offset := (req.Page - 1) * req.Num
 
 	//获取该用户的所有合同
-	contracts, err := dao.GetContractList(req.ArtistUid, req.Num, offset)
+	contracts, err := dao.GetContractList(req.ArtistUid, req.Num, offset, req.Status)
 	if err != nil {
 		return
 	}
@@ -237,6 +237,37 @@ func (a *Contract) FinishContract(req *contract.FinishContractRequest) (rep *con
 	return
 }
 
+func (a *Contract) GetContractInfoByContractUid(req *contract.GetContractInfoByContractUidRequest) (rep *contract.GetContractInfoByContractUidRespond, err error) {
+
+	rep = &contract.GetContractInfoByContractUidRespond{}
+
+	contractInfo, err := dao.GetContractInfo(req.ContractUid)
+	if err != nil {
+		return
+	}
+	contract := &contract.Contracts{
+		ContractUid:   contractInfo.Uid,
+		ArtistUid:     contractInfo.ArtistUid,
+		ArtworkUid:    contractInfo.ArtworkUid,
+		ContractId:    contractInfo.ContractId,
+		TransactionId: contractInfo.TransactionId,
+		Type:          contractInfo.Type,
+		ViewUrl:       contractInfo.ViewUrl,
+		DownloadUrl:   contractInfo.DownloadUrl,
+		State:         contractInfo.State,
+		Status:        contractInfo.Status,
+		LockTime:      contractInfo.LockTime,
+		SignTime:      contractInfo.SignTime,
+		BatchTime:     contractInfo.BatchTime,
+		BatchUid:      contractInfo.BatchUid,
+		StType:        contractInfo.StType,
+	}
+
+	rep.Data = contract
+
+	return
+}
+
 // func (a *Contract) SignContract(req *contract.SignContractRequest) (rep *contract.SignContractRespond, err error) {
 // 	rep = &contract.SignContractRespond{}
 
@@ -671,34 +702,6 @@ func (a *Contract) FinishContract(req *contract.FinishContractRequest) (rep *con
 // 	return rep, nil
 // }
 
-func (a *Contract) GetContractInfoByContractUid(req *contract.GetContractInfoByContractUidRequest) (rep *contract.GetContractInfoByContractUidRespond, err error) {
-
-	rep = &contract.GetContractInfoByContractUidRespond{}
-
-	contractInfo, err := dao.GetContractInfo(req.ContractUid)
-	if err != nil {
-		return
-	}
-	contract := &contract.Contracts{
-		ContractUid:   contractInfo.Uid,
-		ArtistUid:     contractInfo.ArtistUid,
-		ArtworkUid:    contractInfo.ArtworkUid,
-		ContractId:    contractInfo.ContractId,
-		TransactionId: contractInfo.TransactionId,
-		Type:          contractInfo.Type,
-		ViewUrl:       contractInfo.ViewUrl,
-		DownloadUrl:   contractInfo.DownloadUrl,
-		State:         contractInfo.State,
-		Status:        contractInfo.Status,
-		LockTime:      contractInfo.LockTime,
-		SignTime:      contractInfo.SignTime,
-	}
-
-	rep.Data = contract
-
-	return
-}
-
 // func (a *Contract) ContractTxList(req *contract.ContractTxListRequest) (rep *contract.ContractTxListRespond, err error) {
 
 // 	rep = &contract.ContractTxListRespond{}

cmd/internal/logic/statement.go

@@ -0,0 +1,140 @@
+package logic
+
+import (
+	"github.com/fonchain/fonchain-artistinfo/cmd/internal/dao"
+	statement "github.com/fonchain/fonchain-artistinfo/pb/artistinfoStatement"
+)
+
+type IStatement interface {
+	StatementList(req *statement.StatementListRequest) (rep *statement.StatementListRespond, err error)
+	GetTxInfoByBatchUid(req *statement.GetTxInfoByBatchUidRequest) (rep *statement.GetTxInfoByBatchUidRespond, err error)
+	GetCopyInfoByBatchUid(req *statement.GetCopyInfoByBatchUidRequest) (rep *statement.GetCopyInfoByBatchUidRespond, err error)
+}
+
+func NewStatement() IStatement {
+	return &Statement{}
+}
+
+type Statement struct {
+}
+
+func (a *Statement) StatementList(req *statement.StatementListRequest) (rep *statement.StatementListRespond, err error) {
+	//查看是否有该画家
+	user, err := dao.GetArtistInfoById(req.ArtistUid)
+	if err != nil {
+		return
+	}
+
+	ContractData, err := dao.StatementList(user.MgmtArtistUid, req.State)
+	if err != nil {
+		return
+	}
+
+	rep = &statement.StatementListRespond{
+		Data: ContractData,
+	}
+
+	return
+}
+
+func (a *Statement) GetTxInfoByBatchUid(req *statement.GetTxInfoByBatchUidRequest) (rep *statement.GetTxInfoByBatchUidRespond, err error) {
+
+	rep = &statement.GetTxInfoByBatchUidRespond{}
+
+	//获取画家名
+	artworkTx, err := dao.GetTxArtistNameByBatchUid(req.BatchUid)
+	if err != nil {
+		return
+	}
+	rep.ArtistName = artworkTx.ArtistName
+
+	//获取物权画作详细信息
+	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.MinPrice = v.MinPrice
+		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
+}
+
+func (a *Statement) GetCopyInfoByBatchUid(req *statement.GetCopyInfoByBatchUidRequest) (rep *statement.GetCopyInfoByBatchUidRespond, err error) {
+
+	rep = &statement.GetCopyInfoByBatchUidRespond{}
+
+	//获取画家名
+	artworkTx, err := dao.GetCopyArtistNameByBatchUid(req.BatchUid)
+	if err != nil {
+		return
+	}
+	rep.ArtistName = artworkTx.ArtistName
+
+	//获取版权画作详细信息
+	artworkTxDetails, err := dao.GetArtworkCopyDetailByBatchUid(req.BatchUid)
+	if err != nil {
+		return
+	}
+	rep.ArtistName = artworkTx.ArtistName
+
+	//获取版权画作被售卖详细信息
+	artworkSoldTxDetails, err := dao.GetArtworkSoldCopyDetailByBatchUid(req.BatchUid)
+	if err != nil {
+		return
+	}
+
+	artworkCopyDetail := new(statement.ArtworkCopyDetail)
+	artworkSoldCopyDetail := new(statement.ArtworkSoldCopyDetail)
+
+	for _, v := range artworkTxDetails {
+		artworkCopyDetail.TfNum = v.TfNum
+		artworkCopyDetail.ArtworkName = v.ArtworkName
+		artworkCopyDetail.Ruler = v.Ruler
+		artworkCopyDetail.MinPrice = v.MinPrice
+		artworkCopyDetail.GuaranteePrice = v.GuaranteePrice
+		rep.ArtworkCopyDetail = append(rep.ArtworkCopyDetail, artworkCopyDetail)
+	}
+
+	for _, v := range artworkSoldTxDetails {
+		artworkSoldCopyDetail.TfNum = v.TfNum
+		artworkSoldCopyDetail.ArtworkName = v.ArtworkName
+		artworkSoldCopyDetail.Ruler = v.Ruler
+		artworkSoldCopyDetail.SaleNo = v.SaleNo
+		artworkSoldCopyDetail.CompleteDate = v.CompleteDate
+		artworkSoldCopyDetail.MinPrice = v.MinPrice
+		artworkSoldCopyDetail.SalePrice = v.SalePrice
+		artworkSoldCopyDetail.GuaranteePrice = v.GuaranteePrice
+		rep.ArtworkSoldCopyDetail = append(rep.ArtworkSoldCopyDetail, artworkSoldCopyDetail)
+	}
+
+	return
+}

cmd/model/artworkStatement.go

@@ -1,51 +0,0 @@
-package model
-
-// 对账单委托画作批次
-type StatementBatch struct {
-	Model
-	// StType         int32             `gorm:"column:st_type;unqiueIndex:sttype_uid_batchtime_idx;comment:对账单类型 1=版权 2=物权;"`
-	ArtistUid  string `gorm:"column:artist_uid;unqiueIndex:sttype_uid_batchtime_idx;comment:画家uid"`
-	ArtistName string `gorm:"column:artist_name;comment:画家姓名;"`
-	BatchTime  string `gorm:"column:batch_time;unqiueIndex:sttype_uid_batchtime_idx;comment:批次时间;"`
-	FlowStatus int32  `gorm:"column:flow_status;default:1;comment:流程状态 1=未生成 2=已生成未签署 3=已签署"`
-	// FileUrl    string `gorm:"column:file_url,comment:对账单文件地址;"`
-
-	EntrustList []ArtworkEntrustDetail `gorm:"foreignKey:BatchId"` //当前批次的委托单详情
-	SalesList   []ArtworkSalesDetail   `gorm:"foreignKey:BatchId"` //当前批次的销售单详情
-}
-
-func (StatementBatch) TableName() string {
-	return "statement_batch"
-}
-
-// 对账单画作委托详情
-type ArtworkEntrustDetail struct {
-	Model
-	BatchId        int64   `gorm:"column:batch_id;unqiueIndex:batchid_tfnum_idx;comment:批次id;"`
-	TfNum          string  `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号"`
-	ArtworkName    string  `gorm:"column:artwork_name;comment:画作名称"`
-	Ruler          string  `gorm:"column:ruler;comment:平尺"`
-	SaleNo         string  `gorm:"column:sale_no;comment:销售单号"`
-	CompleteDate   string  `gorm:"column:complete_date;comment:成交日期"`
-	MinPrice       float32 `gorm:"column:min_price;comment:委托销售底价"`
-	GuaranteePrice float32 `gorm:"column:guarantee_price;comment:已收取保证金;"`
-}
-
-func (ArtworkEntrustDetail) TableName() string {
-	return "artwork_entrust_detail"
-}
-
-//对账单画作销售详情
-type ArtworkSalesDetail struct {
-	Model
-	BatchId      int64  `gorm:"column:batch_id;unqiueIndex:batchid_tfnum_idx;comment:批次id;"`
-	TfNum        string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号"`
-	ArtworkName  string `gorm:"column:artwork_name;comment:画作名称"`
-	Ruler        string `gorm:"column:ruler;comment:平尺"`
-	SaleNo       string `gorm:"column:sale_no;comment:销售单号"`
-	CompleteDate string `gorm:"column:complete_date;comment:成交日期"`
-}
-
-func (ArtworkSalesDetail) TableName() string {
-	return "artwork_sales_detail"
-}

cmd/model/contract.go

@@ -4,22 +4,30 @@ import "gorm.io/plugin/soft_delete"
 
 // Contract 用户模型
 type Contract struct {
-	ID            int32  `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"`
+	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"`
+	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"`
+	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"`
+	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"`
+	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"`
+	TransactionId         string                  `gorm:"column:transaction_id;type:varchar(300);comment:交易id" json:"transaction_id"`
-	Type          int32  `gorm:"column:type;type:int(1);comment:合同类型;NOT NULL" json:"type"`
+	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"`
+	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"`
+	DownloadUrl           string                  `gorm:"column:download_url;type:varchar(500);comment:合同下载链接" json:"download_url"`
-	State         int32  `gorm:"column:state;type:int(1);comment:合同状态;NOT NULL" json:"state"` //1 未签署
+	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" `    //跟随用户的锁定和解锁状态,用于控制数据的展示
+	Status                int32                   `gorm:"column:status;default:2;comment:2=锁定 3=解锁" json:"status" `               //跟随用户的锁定和解锁状态,用于控制数据的展示
-	LockTime      string `gorm:"column:lock_time;comment:锁定时间" json:"lockTime"`
+	LockTime              string                  `gorm:"column:lock_time;comment:锁定时间" json:"lockTime"`
-	SignTime      string `gorm:"column:sign_time;comment:签署时间" json:"sign_time"`
+	SignTime              string                  `gorm:"column:sign_time;comment:签署时间" json:"sign_time"`
-	BatchId       int32  `gorm:"column:batch_id;comment:批次ID" json:"batch_id"`
+	BatchTime             string                  `gorm:"column:batch_time;comment:批次时间" json:"batch_time"`
-	BatchName     string `gorm:"column:batch_name;comment:批次名" json:"batch_name"`
+	BatchUid              string                  `gorm:"column:batch_uid;comment:批次ID" json:"batch_uid"`
-	CreatedAt     int32  `gorm:"column:created_at;autoCreateTime"`
+	StType                int32                   `gorm:"column:st_type;unqiueIndex:sttype_uid_batchtime_idx;comment:对账单类型 1=版权 2=物权;"`
-	UpdatedAt     int32  `gorm:"column:updated_at;autoCreateTime"`
+	ArtworkTx             *ArtworkTx              `gorm:"foreignKey:BatchUid;references:Uid"`      //当前批次的物权委托单
-	DeletedAt     soft_delete.DeletedAt
+	ArtworkCopy           *ArtworkCopy            `gorm:"foreignKey:BatchUid;references:Uid"`      //当前批次的版权委托单
+	ArtworkTxDetail       []ArtworkTxDetail       `gorm:"foreignKey:BatchUid;references:BatchUid"` //当前批次的物权委托单详情
+	ArtworkSoldTxDetail   []ArtworkSoldTxDetail   `gorm:"foreignKey:BatchUid;references:BatchUid"` //当前批次的已被售卖物权委托单详情
+	ArtworkCopyDetail     []ArtworkCopyDetail     `gorm:"foreignKey:BatchUid;references:BatchUid"` //当前批次的版权委托单详情
+	ArtworkSoldCopyDetail []ArtworkSoldCopyDetail `gorm:"foreignKey:BatchUid;references:BatchUid"` //当前批次的已被售卖版权委托单详情
+	CreatedAt             int32                   `gorm:"column:created_at;autoCreateTime"`
+	UpdatedAt             int32                   `gorm:"column:updated_at;autoCreateTime"`
+	DeletedAt             soft_delete.DeletedAt
+	OldMgmtDataId         int32 `gorm:"column:old_mgmt_data_id"` //老画家宝中的id
 }

cmd/model/statement.go

@@ -0,0 +1,93 @@
+package model
+
+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:对账单画作物权表的唯一表示,即批次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"`
+	BatchTime  string `gorm:"column:batch_time;comment:批次时间" json:"batch_time"`
+	CreatedAt  int32  `gorm:"column:created_at;autoCreateTime"`
+	UpdatedAt  int32  `gorm:"column:updated_at;autoCreateTime"`
+	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:对账单画作物权表的唯一表示,即批次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:平尺"`
+	SaleNo         string  `gorm:"column:sale_no;comment:销售单号"`
+	CompleteDate   string  `gorm:"column:complete_date;comment:成交日期"`
+	MinPrice       float32 `gorm:"column:min_price;comment:委托销售底价"`
+	SalePrice      float32 `gorm:"column:sale_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 ArtworkCopy struct {
+	ID         int32  `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"`
+	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"`
+	BatchTime  string `gorm:"column:batch_time;comment:批次时间" json:"batch_time"`
+	CreatedAt  int32  `gorm:"column:created_at;autoCreateTime"`
+	UpdatedAt  int32  `gorm:"column:updated_at;autoCreateTime"`
+	DeletedAt  soft_delete.DeletedAt
+}
+
+// 对账单画作版权委托详情（该画家一个批次的全部画作）
+type ArtworkCopyDetail 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:平尺"`
+	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 ArtworkSoldCopyDetail 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:平尺"`
+	SaleNo         string  `gorm:"column:sale_no;comment:销售单号"`
+	CompleteDate   string  `gorm:"column:complete_date;comment:成交日期"`
+	MinPrice       float32 `gorm:"column:min_price;comment:委托销售底价"`
+	SalePrice      float32 `gorm:"column:sale_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
+}

conf/dev/dubbogo.yaml

@@ -27,6 +27,9 @@ dubbo:
       ArtistInfoContractProvider:
         interface: com.fontree.microservices.common.ArtistInfoContract
         retries: 100
+      ArtistInfoStatementProvider:
+        interface: com.fontree.microservices.common.ArtistInfoStatement
+        retries: 100
         #ContractProvider:
         #  interface: com.fontree.microservices.common.Contract
         # retries: 0

conf/dubbogo.yaml

@@ -31,6 +31,9 @@ dubbo:
       ArtistInfoContractProvider:
         interface: com.fontree.microservices.common.ArtistInfoContract
         retries: 100
+      ArtistInfoStatementProvider:
+        interface: com.fontree.microservices.common.ArtistInfoStatement
+        retries: 100
       #ContractProvider:
       #  interface: com.fontree.microservices.common.Contract
         # retries: 0

conf/prod/dubbogo.yaml

@@ -31,6 +31,9 @@ dubbo:
       ArtistInfoContractProvider:
         interface: com.fontree.microservices.common.ArtistInfoContract
         retries: 100
+      ArtistInfoStatementProvider:
+        interface: com.fontree.microservices.common.ArtistInfoStatement
+        retries: 100
   consumer:
     request-timeout: 120s
     references:

conf/test/dubbogo.yaml

@@ -31,6 +31,9 @@ dubbo:
       ArtistInfoContractProvider:
         interface: com.fontree.microservices.common.ArtistInfoContract
         retries: 100
+      ArtistInfoStatementProvider:
+        interface: com.fontree.microservices.common.ArtistInfoStatement
+        retries: 100
         #ContractProvider:
         #  interface: com.fontree.microservices.common.Contract
         # retries: 0

conf/xjjdev/dubbogo.yaml

@@ -31,6 +31,9 @@ dubbo:
       ArtistInfoContractProvider:
         interface: com.fontree.microservices.common.ArtistInfoContract
         retries: 100
+      ArtistInfoStatementProvider:
+        interface: com.fontree.microservices.common.ArtistInfoStatement
+        retries: 100
       #ContractProvider:
       #  interface: com.fontree.microservices.common.Contract
         # retries: 0

pb/artistinfoStatement/artistinfoStatement_triple.pb.go

@@ -1,418 +0,0 @@
-// Code generated by protoc-gen-go-triple. DO NOT EDIT.
-// versions:
-// - protoc-gen-go-triple v1.0.8
-// - protoc             v4.22.0--rc2
-// source: pb/artistinfoStatement.proto
-
-package artistinfoStatement
-
-import (
-	context "context"
-	protocol "dubbo.apache.org/dubbo-go/v3/protocol"
-	dubbo3 "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3"
-	invocation "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
-	grpc_go "github.com/dubbogo/grpc-go"
-	codes "github.com/dubbogo/grpc-go/codes"
-	metadata "github.com/dubbogo/grpc-go/metadata"
-	status "github.com/dubbogo/grpc-go/status"
-	common "github.com/dubbogo/triple/pkg/common"
-	constant "github.com/dubbogo/triple/pkg/common/constant"
-	triple "github.com/dubbogo/triple/pkg/triple"
-	emptypb "google.golang.org/protobuf/types/known/emptypb"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the grpc package it is being compiled against.
-const _ = grpc_go.SupportPackageIsVersion7
-
-// StatementClient is the client API for Statement service.
-//
-// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
-type StatementClient interface {
-	CreateStatementBatch(ctx context.Context, in *StatementBatchRequest, opts ...grpc_go.CallOption) (*CreateStatementBatchResponse, common.ErrorWithAttachment)
-	BatchCreateStatementBatch(ctx context.Context, in *BatchCreateStatementBatchRequest, opts ...grpc_go.CallOption) (*emptypb.Empty, common.ErrorWithAttachment)
-	GetStatementBatchList(ctx context.Context, in *GetStatementBatchListRequest, opts ...grpc_go.CallOption) (*GetStatementBatchListResponse, common.ErrorWithAttachment)
-	GetStatementBatchTimeMenus(ctx context.Context, in *GetStatementBatchListRequest, opts ...grpc_go.CallOption) (*GetStatementBatchTimeMenusResponse, common.ErrorWithAttachment)
-	CreateStatementDetail(ctx context.Context, in *StatementDetailRequest, opts ...grpc_go.CallOption) (*CreateStatementDetailResponse, common.ErrorWithAttachment)
-	BatchCreateStatementDetail(ctx context.Context, in *BatchCreateStatementDetailRequest, opts ...grpc_go.CallOption) (*emptypb.Empty, common.ErrorWithAttachment)
-	GetStatementDetailList(ctx context.Context, in *GetStatementDetailListRequest, opts ...grpc_go.CallOption) (*GetStatementDetailListResponse, common.ErrorWithAttachment)
-}
-
-type statementClient struct {
-	cc *triple.TripleConn
-}
-
-type StatementClientImpl struct {
-	CreateStatementBatch       func(ctx context.Context, in *StatementBatchRequest) (*CreateStatementBatchResponse, error)
-	BatchCreateStatementBatch  func(ctx context.Context, in *BatchCreateStatementBatchRequest) (*emptypb.Empty, error)
-	GetStatementBatchList      func(ctx context.Context, in *GetStatementBatchListRequest) (*GetStatementBatchListResponse, error)
-	GetStatementBatchTimeMenus func(ctx context.Context, in *GetStatementBatchListRequest) (*GetStatementBatchTimeMenusResponse, error)
-	CreateStatementDetail      func(ctx context.Context, in *StatementDetailRequest) (*CreateStatementDetailResponse, error)
-	BatchCreateStatementDetail func(ctx context.Context, in *BatchCreateStatementDetailRequest) (*emptypb.Empty, error)
-	GetStatementDetailList     func(ctx context.Context, in *GetStatementDetailListRequest) (*GetStatementDetailListResponse, error)
-}
-
-func (c *StatementClientImpl) GetDubboStub(cc *triple.TripleConn) StatementClient {
-	return NewStatementClient(cc)
-}
-
-func (c *StatementClientImpl) XXX_InterfaceName() string {
-	return "artistinfo.Statement"
-}
-
-func NewStatementClient(cc *triple.TripleConn) StatementClient {
-	return &statementClient{cc}
-}
-
-func (c *statementClient) CreateStatementBatch(ctx context.Context, in *StatementBatchRequest, opts ...grpc_go.CallOption) (*CreateStatementBatchResponse, common.ErrorWithAttachment) {
-	out := new(CreateStatementBatchResponse)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/CreateStatementBatch", in, out)
-}
-
-func (c *statementClient) BatchCreateStatementBatch(ctx context.Context, in *BatchCreateStatementBatchRequest, opts ...grpc_go.CallOption) (*emptypb.Empty, common.ErrorWithAttachment) {
-	out := new(emptypb.Empty)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BatchCreateStatementBatch", in, out)
-}
-
-func (c *statementClient) GetStatementBatchList(ctx context.Context, in *GetStatementBatchListRequest, opts ...grpc_go.CallOption) (*GetStatementBatchListResponse, common.ErrorWithAttachment) {
-	out := new(GetStatementBatchListResponse)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetStatementBatchList", in, out)
-}
-
-func (c *statementClient) GetStatementBatchTimeMenus(ctx context.Context, in *GetStatementBatchListRequest, opts ...grpc_go.CallOption) (*GetStatementBatchTimeMenusResponse, common.ErrorWithAttachment) {
-	out := new(GetStatementBatchTimeMenusResponse)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetStatementBatchTimeMenus", in, out)
-}
-
-func (c *statementClient) CreateStatementDetail(ctx context.Context, in *StatementDetailRequest, opts ...grpc_go.CallOption) (*CreateStatementDetailResponse, common.ErrorWithAttachment) {
-	out := new(CreateStatementDetailResponse)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/CreateStatementDetail", in, out)
-}
-
-func (c *statementClient) BatchCreateStatementDetail(ctx context.Context, in *BatchCreateStatementDetailRequest, opts ...grpc_go.CallOption) (*emptypb.Empty, common.ErrorWithAttachment) {
-	out := new(emptypb.Empty)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BatchCreateStatementDetail", in, out)
-}
-
-func (c *statementClient) GetStatementDetailList(ctx context.Context, in *GetStatementDetailListRequest, opts ...grpc_go.CallOption) (*GetStatementDetailListResponse, common.ErrorWithAttachment) {
-	out := new(GetStatementDetailListResponse)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetStatementDetailList", in, out)
-}
-
-// StatementServer is the server API for Statement service.
-// All implementations must embed UnimplementedStatementServer
-// for forward compatibility
-type StatementServer interface {
-	CreateStatementBatch(context.Context, *StatementBatchRequest) (*CreateStatementBatchResponse, error)
-	BatchCreateStatementBatch(context.Context, *BatchCreateStatementBatchRequest) (*emptypb.Empty, error)
-	GetStatementBatchList(context.Context, *GetStatementBatchListRequest) (*GetStatementBatchListResponse, error)
-	GetStatementBatchTimeMenus(context.Context, *GetStatementBatchListRequest) (*GetStatementBatchTimeMenusResponse, error)
-	CreateStatementDetail(context.Context, *StatementDetailRequest) (*CreateStatementDetailResponse, error)
-	BatchCreateStatementDetail(context.Context, *BatchCreateStatementDetailRequest) (*emptypb.Empty, error)
-	GetStatementDetailList(context.Context, *GetStatementDetailListRequest) (*GetStatementDetailListResponse, error)
-	mustEmbedUnimplementedStatementServer()
-}
-
-// UnimplementedStatementServer must be embedded to have forward compatible implementations.
-type UnimplementedStatementServer struct {
-	proxyImpl protocol.Invoker
-}
-
-func (UnimplementedStatementServer) CreateStatementBatch(context.Context, *StatementBatchRequest) (*CreateStatementBatchResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method CreateStatementBatch not implemented")
-}
-func (UnimplementedStatementServer) BatchCreateStatementBatch(context.Context, *BatchCreateStatementBatchRequest) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method BatchCreateStatementBatch not implemented")
-}
-func (UnimplementedStatementServer) GetStatementBatchList(context.Context, *GetStatementBatchListRequest) (*GetStatementBatchListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetStatementBatchList not implemented")
-}
-func (UnimplementedStatementServer) GetStatementBatchTimeMenus(context.Context, *GetStatementBatchListRequest) (*GetStatementBatchTimeMenusResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetStatementBatchTimeMenus not implemented")
-}
-func (UnimplementedStatementServer) CreateStatementDetail(context.Context, *StatementDetailRequest) (*CreateStatementDetailResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method CreateStatementDetail not implemented")
-}
-func (UnimplementedStatementServer) BatchCreateStatementDetail(context.Context, *BatchCreateStatementDetailRequest) (*emptypb.Empty, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method BatchCreateStatementDetail not implemented")
-}
-func (UnimplementedStatementServer) GetStatementDetailList(context.Context, *GetStatementDetailListRequest) (*GetStatementDetailListResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetStatementDetailList not implemented")
-}
-func (s *UnimplementedStatementServer) XXX_SetProxyImpl(impl protocol.Invoker) {
-	s.proxyImpl = impl
-}
-
-func (s *UnimplementedStatementServer) XXX_GetProxyImpl() protocol.Invoker {
-	return s.proxyImpl
-}
-
-func (s *UnimplementedStatementServer) XXX_ServiceDesc() *grpc_go.ServiceDesc {
-	return &Statement_ServiceDesc
-}
-func (s *UnimplementedStatementServer) XXX_InterfaceName() string {
-	return "artistinfo.Statement"
-}
-
-func (UnimplementedStatementServer) mustEmbedUnimplementedStatementServer() {}
-
-// UnsafeStatementServer may be embedded to opt out of forward compatibility for this service.
-// Use of this interface is not recommended, as added methods to StatementServer will
-// result in compilation errors.
-type UnsafeStatementServer interface {
-	mustEmbedUnimplementedStatementServer()
-}
-
-func RegisterStatementServer(s grpc_go.ServiceRegistrar, srv StatementServer) {
-	s.RegisterService(&Statement_ServiceDesc, srv)
-}
-
-func _Statement_CreateStatementBatch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(StatementBatchRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	base := srv.(dubbo3.Dubbo3GrpcService)
-	args := []interface{}{}
-	args = append(args, in)
-	md, _ := metadata.FromIncomingContext(ctx)
-	invAttachment := make(map[string]interface{}, len(md))
-	for k, v := range md {
-		invAttachment[k] = v
-	}
-	invo := invocation.NewRPCInvocation("CreateStatementBatch", args, invAttachment)
-	if interceptor == nil {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	info := &grpc_go.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Statement_BatchCreateStatementBatch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BatchCreateStatementBatchRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	base := srv.(dubbo3.Dubbo3GrpcService)
-	args := []interface{}{}
-	args = append(args, in)
-	md, _ := metadata.FromIncomingContext(ctx)
-	invAttachment := make(map[string]interface{}, len(md))
-	for k, v := range md {
-		invAttachment[k] = v
-	}
-	invo := invocation.NewRPCInvocation("BatchCreateStatementBatch", args, invAttachment)
-	if interceptor == nil {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	info := &grpc_go.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Statement_GetStatementBatchList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetStatementBatchListRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	base := srv.(dubbo3.Dubbo3GrpcService)
-	args := []interface{}{}
-	args = append(args, in)
-	md, _ := metadata.FromIncomingContext(ctx)
-	invAttachment := make(map[string]interface{}, len(md))
-	for k, v := range md {
-		invAttachment[k] = v
-	}
-	invo := invocation.NewRPCInvocation("GetStatementBatchList", args, invAttachment)
-	if interceptor == nil {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	info := &grpc_go.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Statement_GetStatementBatchTimeMenus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetStatementBatchListRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	base := srv.(dubbo3.Dubbo3GrpcService)
-	args := []interface{}{}
-	args = append(args, in)
-	md, _ := metadata.FromIncomingContext(ctx)
-	invAttachment := make(map[string]interface{}, len(md))
-	for k, v := range md {
-		invAttachment[k] = v
-	}
-	invo := invocation.NewRPCInvocation("GetStatementBatchTimeMenus", args, invAttachment)
-	if interceptor == nil {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	info := &grpc_go.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Statement_CreateStatementDetail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(StatementDetailRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	base := srv.(dubbo3.Dubbo3GrpcService)
-	args := []interface{}{}
-	args = append(args, in)
-	md, _ := metadata.FromIncomingContext(ctx)
-	invAttachment := make(map[string]interface{}, len(md))
-	for k, v := range md {
-		invAttachment[k] = v
-	}
-	invo := invocation.NewRPCInvocation("CreateStatementDetail", args, invAttachment)
-	if interceptor == nil {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	info := &grpc_go.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Statement_BatchCreateStatementDetail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(BatchCreateStatementDetailRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	base := srv.(dubbo3.Dubbo3GrpcService)
-	args := []interface{}{}
-	args = append(args, in)
-	md, _ := metadata.FromIncomingContext(ctx)
-	invAttachment := make(map[string]interface{}, len(md))
-	for k, v := range md {
-		invAttachment[k] = v
-	}
-	invo := invocation.NewRPCInvocation("BatchCreateStatementDetail", args, invAttachment)
-	if interceptor == nil {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	info := &grpc_go.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Statement_GetStatementDetailList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetStatementDetailListRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	base := srv.(dubbo3.Dubbo3GrpcService)
-	args := []interface{}{}
-	args = append(args, in)
-	md, _ := metadata.FromIncomingContext(ctx)
-	invAttachment := make(map[string]interface{}, len(md))
-	for k, v := range md {
-		invAttachment[k] = v
-	}
-	invo := invocation.NewRPCInvocation("GetStatementDetailList", args, invAttachment)
-	if interceptor == nil {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	info := &grpc_go.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
-		return result, result.Error()
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-// Statement_ServiceDesc is the grpc_go.ServiceDesc for Statement service.
-// It's only intended for direct use with grpc_go.RegisterService,
-// and not to be introspected or modified (even as a copy)
-var Statement_ServiceDesc = grpc_go.ServiceDesc{
-	ServiceName: "artistinfo.Statement",
-	HandlerType: (*StatementServer)(nil),
-	Methods: []grpc_go.MethodDesc{
-		{
-			MethodName: "CreateStatementBatch",
-			Handler:    _Statement_CreateStatementBatch_Handler,
-		},
-		{
-			MethodName: "BatchCreateStatementBatch",
-			Handler:    _Statement_BatchCreateStatementBatch_Handler,
-		},
-		{
-			MethodName: "GetStatementBatchList",
-			Handler:    _Statement_GetStatementBatchList_Handler,
-		},
-		{
-			MethodName: "GetStatementBatchTimeMenus",
-			Handler:    _Statement_GetStatementBatchTimeMenus_Handler,
-		},
-		{
-			MethodName: "CreateStatementDetail",
-			Handler:    _Statement_CreateStatementDetail_Handler,
-		},
-		{
-			MethodName: "BatchCreateStatementDetail",
-			Handler:    _Statement_BatchCreateStatementDetail_Handler,
-		},
-		{
-			MethodName: "GetStatementDetailList",
-			Handler:    _Statement_GetStatementDetailList_Handler,
-		},
-	},
-	Streams:  []grpc_go.StreamDesc{},
-	Metadata: "pb/artistinfoStatement.proto",
-}

pb/artistinfoStatement/statement.proto

@@ -0,0 +1,103 @@
+syntax = "proto3";
+package statement;
+option go_package = "./;statement";
+
+service Statement {
+    rpc StatementList (StatementListRequest) returns (StatementListRespond) {}
+    rpc GetTxInfoByBatchUid (GetTxInfoByBatchUidRequest) returns (GetTxInfoByBatchUidRespond) {}
+    rpc GetCopyInfoByBatchUid (GetCopyInfoByBatchUidRequest) returns (GetCopyInfoByBatchUidRespond) {}
+}
+
+message Contracts{
+    string ContractUid = 1 [json_name = "contract_uid"];
+    string ArtistUid = 2 [json_name = "artist_uid"];
+    string ArtworkUid = 3 [json_name = "artwork_uid"];
+    string ContractId = 4 [json_name = "contract_id"];
+    string TransactionId = 5 [json_name = "transaction_id"];
+    int32 Type = 6 [json_name = "type"];
+    string ViewUrl = 7 [json_name = "view_url"];
+    string DownloadUrl = 8 [json_name = "download_url"];
+    int32 State = 9 [json_name = "state"];
+    int32 Status = 10 [json_name = "status"];
+    string ExpirationTime = 11 [json_name = "expiration_time"];
+    string LockTime = 12 [json_name = "lock_time"];
+    string SignTime = 13 [json_name = "sign_time"]; 
+    string BatchTime = 14 [json_name = "batch_time"]; 
+    string BatchUid = 15 [json_name = "batch_uid"]; 
+ }
+
+ 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"];
+    string Ruler = 4 [json_name = "ruler"];
+    string SaleNo = 5 [json_name = "sale_no"];
+    string CompleteDate = 6 [json_name = "complete_date"];
+    float MinPrice = 7 [json_name = "min_price"];
+    float SalePrice = 8 [json_name = "sale_price"];
+    float GuaranteePrice = 9 [json_name = "guarantee_price"];
+ }
+
+ message ArtworkCopyDetail{
+    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 ArtworkSoldCopyDetail{
+    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"];
+    string SaleNo = 5 [json_name = "sale_no"];
+    string CompleteDate = 6 [json_name = "complete_date"];
+    float MinPrice = 7 [json_name = "min_price"];
+    float SalePrice = 8 [json_name = "sale_price"];
+    float GuaranteePrice = 9 [json_name = "guarantee_price"];
+ }
+
+message StatementListRequest {
+    string ArtistUid = 1 [json_name = "artist_uid"];
+    int32 PageSize = 2  [json_name="pageSize"];
+    int32 Page = 3 [json_name="page"];
+    int32 State = 4 [json_name="state"];
+}
+
+message StatementListRespond {
+    repeated Contracts Data = 1 [json_name = "data"];
+    string Msg = 2 [json_name = "msg"];
+}
+
+message GetTxInfoByBatchUidRequest {
+    string BatchUid = 1 [json_name = "batch_uid"];
+}
+
+message GetTxInfoByBatchUidRespond {
+    string ArtistName = 1 [json_name = "artist_name"];
+    repeated ArtworkTxDetail ArtworkTxDetail = 2 [json_name = "artwork_tx_detail"];
+    repeated ArtworkSoldTxDetail ArtworkSoldTxDetail = 3 [json_name = "artwork_sold_tx_detail"];
+    string Msg = 4 [json_name = "msg"];
+}
+
+message GetCopyInfoByBatchUidRequest {
+    string BatchUid = 1 [json_name = "batch_uid"];
+}
+
+message GetCopyInfoByBatchUidRespond {
+    string ArtistName = 1 [json_name = "artist_name"];
+    repeated ArtworkCopyDetail ArtworkCopyDetail = 2 [json_name = "artwork_copy_detail"];
+    repeated ArtworkSoldCopyDetail ArtworkSoldCopyDetail = 3 [json_name = "artwork_sold_copy_detail"];
+    string Msg = 4 [json_name = "msg"];
+}

pb/artistinfoStatement/statement.validator.pb.go

@@ -0,0 +1,85 @@
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
+// source: statement.proto
+
+package statement
+
+import (
+	fmt "fmt"
+	math "math"
+	proto "github.com/golang/protobuf/proto"
+	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+func (this *Contracts) Validate() error {
+	return nil
+}
+func (this *ArtworkTxDetail) Validate() error {
+	return nil
+}
+func (this *ArtworkSoldTxDetail) Validate() error {
+	return nil
+}
+func (this *ArtworkCopyDetail) Validate() error {
+	return nil
+}
+func (this *ArtworkSoldCopyDetail) Validate() error {
+	return nil
+}
+func (this *StatementListRequest) Validate() error {
+	return nil
+}
+func (this *StatementListRespond) Validate() error {
+	for _, item := range this.Data {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *GetTxInfoByBatchUidRequest) Validate() error {
+	return nil
+}
+func (this *GetTxInfoByBatchUidRespond) Validate() error {
+	for _, item := range this.ArtworkTxDetail {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("ArtworkTxDetail", err)
+			}
+		}
+	}
+	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
+}
+func (this *GetCopyInfoByBatchUidRequest) Validate() error {
+	return nil
+}
+func (this *GetCopyInfoByBatchUidRespond) Validate() error {
+	for _, item := range this.ArtworkCopyDetail {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("ArtworkCopyDetail", err)
+			}
+		}
+	}
+	for _, item := range this.ArtworkSoldCopyDetail {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("ArtworkSoldCopyDetail", err)
+			}
+		}
+	}
+	return nil
+}

pb/artistinfoStatement/statement_triple.pb.go

@@ -0,0 +1,237 @@
+// Code generated by protoc-gen-go-triple. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-triple v1.0.8
+// - protoc             v3.21.8
+// source: statement.proto
+
+package statement
+
+import (
+	context "context"
+	protocol "dubbo.apache.org/dubbo-go/v3/protocol"
+	dubbo3 "dubbo.apache.org/dubbo-go/v3/protocol/dubbo3"
+	invocation "dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+	grpc_go "github.com/dubbogo/grpc-go"
+	codes "github.com/dubbogo/grpc-go/codes"
+	metadata "github.com/dubbogo/grpc-go/metadata"
+	status "github.com/dubbogo/grpc-go/status"
+	common "github.com/dubbogo/triple/pkg/common"
+	constant "github.com/dubbogo/triple/pkg/common/constant"
+	triple "github.com/dubbogo/triple/pkg/triple"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc_go.SupportPackageIsVersion7
+
+// StatementClient is the client API for Statement service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type StatementClient interface {
+	StatementList(ctx context.Context, in *StatementListRequest, opts ...grpc_go.CallOption) (*StatementListRespond, common.ErrorWithAttachment)
+	GetTxInfoByBatchUid(ctx context.Context, in *GetTxInfoByBatchUidRequest, opts ...grpc_go.CallOption) (*GetTxInfoByBatchUidRespond, common.ErrorWithAttachment)
+	GetCopyInfoByBatchUid(ctx context.Context, in *GetCopyInfoByBatchUidRequest, opts ...grpc_go.CallOption) (*GetCopyInfoByBatchUidRespond, common.ErrorWithAttachment)
+}
+
+type statementClient struct {
+	cc *triple.TripleConn
+}
+
+type StatementClientImpl struct {
+	StatementList         func(ctx context.Context, in *StatementListRequest) (*StatementListRespond, error)
+	GetTxInfoByBatchUid   func(ctx context.Context, in *GetTxInfoByBatchUidRequest) (*GetTxInfoByBatchUidRespond, error)
+	GetCopyInfoByBatchUid func(ctx context.Context, in *GetCopyInfoByBatchUidRequest) (*GetCopyInfoByBatchUidRespond, error)
+}
+
+func (c *StatementClientImpl) GetDubboStub(cc *triple.TripleConn) StatementClient {
+	return NewStatementClient(cc)
+}
+
+func (c *StatementClientImpl) XXX_InterfaceName() string {
+	return "statement.Statement"
+}
+
+func NewStatementClient(cc *triple.TripleConn) StatementClient {
+	return &statementClient{cc}
+}
+
+func (c *statementClient) StatementList(ctx context.Context, in *StatementListRequest, opts ...grpc_go.CallOption) (*StatementListRespond, common.ErrorWithAttachment) {
+	out := new(StatementListRespond)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/StatementList", in, out)
+}
+
+func (c *statementClient) GetTxInfoByBatchUid(ctx context.Context, in *GetTxInfoByBatchUidRequest, opts ...grpc_go.CallOption) (*GetTxInfoByBatchUidRespond, common.ErrorWithAttachment) {
+	out := new(GetTxInfoByBatchUidRespond)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetTxInfoByBatchUid", in, out)
+}
+
+func (c *statementClient) GetCopyInfoByBatchUid(ctx context.Context, in *GetCopyInfoByBatchUidRequest, opts ...grpc_go.CallOption) (*GetCopyInfoByBatchUidRespond, common.ErrorWithAttachment) {
+	out := new(GetCopyInfoByBatchUidRespond)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetCopyInfoByBatchUid", in, out)
+}
+
+// StatementServer is the server API for Statement service.
+// All implementations must embed UnimplementedStatementServer
+// for forward compatibility
+type StatementServer interface {
+	StatementList(context.Context, *StatementListRequest) (*StatementListRespond, error)
+	GetTxInfoByBatchUid(context.Context, *GetTxInfoByBatchUidRequest) (*GetTxInfoByBatchUidRespond, error)
+	GetCopyInfoByBatchUid(context.Context, *GetCopyInfoByBatchUidRequest) (*GetCopyInfoByBatchUidRespond, error)
+	mustEmbedUnimplementedStatementServer()
+}
+
+// UnimplementedStatementServer must be embedded to have forward compatible implementations.
+type UnimplementedStatementServer struct {
+	proxyImpl protocol.Invoker
+}
+
+func (UnimplementedStatementServer) StatementList(context.Context, *StatementListRequest) (*StatementListRespond, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method StatementList not implemented")
+}
+func (UnimplementedStatementServer) GetTxInfoByBatchUid(context.Context, *GetTxInfoByBatchUidRequest) (*GetTxInfoByBatchUidRespond, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetTxInfoByBatchUid not implemented")
+}
+func (UnimplementedStatementServer) GetCopyInfoByBatchUid(context.Context, *GetCopyInfoByBatchUidRequest) (*GetCopyInfoByBatchUidRespond, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetCopyInfoByBatchUid not implemented")
+}
+func (s *UnimplementedStatementServer) XXX_SetProxyImpl(impl protocol.Invoker) {
+	s.proxyImpl = impl
+}
+
+func (s *UnimplementedStatementServer) XXX_GetProxyImpl() protocol.Invoker {
+	return s.proxyImpl
+}
+
+func (s *UnimplementedStatementServer) XXX_ServiceDesc() *grpc_go.ServiceDesc {
+	return &Statement_ServiceDesc
+}
+func (s *UnimplementedStatementServer) XXX_InterfaceName() string {
+	return "statement.Statement"
+}
+
+func (UnimplementedStatementServer) mustEmbedUnimplementedStatementServer() {}
+
+// UnsafeStatementServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to StatementServer will
+// result in compilation errors.
+type UnsafeStatementServer interface {
+	mustEmbedUnimplementedStatementServer()
+}
+
+func RegisterStatementServer(s grpc_go.ServiceRegistrar, srv StatementServer) {
+	s.RegisterService(&Statement_ServiceDesc, srv)
+}
+
+func _Statement_StatementList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(StatementListRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("StatementList", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Statement_GetTxInfoByBatchUid_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetTxInfoByBatchUidRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("GetTxInfoByBatchUid", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Statement_GetCopyInfoByBatchUid_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetCopyInfoByBatchUidRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("GetCopyInfoByBatchUid", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// Statement_ServiceDesc is the grpc_go.ServiceDesc for Statement service.
+// It's only intended for direct use with grpc_go.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var Statement_ServiceDesc = grpc_go.ServiceDesc{
+	ServiceName: "statement.Statement",
+	HandlerType: (*StatementServer)(nil),
+	Methods: []grpc_go.MethodDesc{
+		{
+			MethodName: "StatementList",
+			Handler:    _Statement_StatementList_Handler,
+		},
+		{
+			MethodName: "GetTxInfoByBatchUid",
+			Handler:    _Statement_GetTxInfoByBatchUid_Handler,
+		},
+		{
+			MethodName: "GetCopyInfoByBatchUid",
+			Handler:    _Statement_GetCopyInfoByBatchUid_Handler,
+		},
+	},
+	Streams:  []grpc_go.StreamDesc{},
+	Metadata: "statement.proto",
+}

pb/contract/contract.pb.go

@@ -38,6 +38,9 @@ type Contracts struct {
 	ExpirationTime string `protobuf:"bytes,11,opt,name=ExpirationTime,json=expiration_time,proto3" json:"ExpirationTime,omitempty"`
 	LockTime       string `protobuf:"bytes,12,opt,name=LockTime,json=lock_time,proto3" json:"LockTime,omitempty"`
 	SignTime       string `protobuf:"bytes,13,opt,name=SignTime,json=sign_time,proto3" json:"SignTime,omitempty"`
+	BatchTime      string `protobuf:"bytes,14,opt,name=BatchTime,json=batch_time,proto3" json:"BatchTime,omitempty"`
+	BatchUid       string `protobuf:"bytes,15,opt,name=BatchUid,json=batch_uid,proto3" json:"BatchUid,omitempty"`
+	StType         int32  `protobuf:"varint,16,opt,name=StType,json=st_yype,proto3" json:"StType,omitempty"`
 }
 
 func (x *Contracts) Reset() {
@@ -163,6 +166,27 @@ func (x *Contracts) GetSignTime() string {
 	return ""
 }
 
+func (x *Contracts) GetBatchTime() string {
+	if x != nil {
+		return x.BatchTime
+	}
+	return ""
+}
+
+func (x *Contracts) GetBatchUid() string {
+	if x != nil {
+		return x.BatchUid
+	}
+	return ""
+}
+
+func (x *Contracts) GetStType() int32 {
+	if x != nil {
+		return x.StType
+	}
+	return 0
+}
+
 type CreateContractRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -279,8 +303,9 @@ type ContractListMgmtRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	ArtistUid string `protobuf:"bytes,1,opt,name=ArtistUid,json=artist_uid,proto3" json:"ArtistUid,omitempty"`
-	Page      int32  `protobuf:"varint,2,opt,name=Page,json=page,proto3" json:"Page,omitempty"`
+	Status    int32  `protobuf:"varint,2,opt,name=Status,json=status,proto3" json:"Status,omitempty"`
-	Num       int32  `protobuf:"varint,3,opt,name=Num,json=num,proto3" json:"Num,omitempty"`
+	Page      int32  `protobuf:"varint,3,opt,name=Page,json=page,proto3" json:"Page,omitempty"`
+	Num       int32  `protobuf:"varint,4,opt,name=Num,json=num,proto3" json:"Num,omitempty"`
 }
 
 func (x *ContractListMgmtRequest) Reset() {
@@ -322,6 +347,13 @@ func (x *ContractListMgmtRequest) GetArtistUid() string {
 	return ""
 }
 
+func (x *ContractListMgmtRequest) GetStatus() int32 {
+	if x != nil {
+		return x.Status
+	}
+	return 0
+}
+
 func (x *ContractListMgmtRequest) GetPage() int32 {
 	if x != nil {
 		return x.Page
@@ -1379,7 +1411,7 @@ var File_contract_proto protoreflect.FileDescriptor
 var file_contract_proto_rawDesc = []byte{
 	0x0a, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x12, 0x0e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
-	0x22, 0x99, 0x03, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x73, 0x12, 0x21,
+	0x22, 0xee, 0x03, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x73, 0x12, 0x21,
 	0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x75, 0x69,
 	0x64, 0x12, 0x1d, 0x0a, 0x09, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x18, 0x02,
@@ -1404,192 +1436,199 @@ var file_contract_proto_rawDesc = []byte{
 	0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x12,
 	0x1b, 0x0a, 0x08, 0x53, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x6b, 0x0a, 0x15,
+	0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x09,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65,
+	0x42, 0x61, 0x74, 0x63, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x09, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55,
+	0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x08, 0x42,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74,
+	0x61, 0x74, 0x63, 0x68, 0x55, 0x69, 0x64, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62,
-	0x5f, 0x75, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0a, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x55,
+	0x61, 0x74, 0x63, 0x68, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x06, 0x53, 0x74, 0x54, 0x79,
-	0x69, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x72, 0x74, 0x77, 0x6f, 0x72,
+	0x70, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x5f, 0x79, 0x79, 0x70,
-	0x6b, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20,
+	0x65, 0x22, 0x6b, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72,
-	0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x29, 0x0a, 0x15, 0x43, 0x72, 0x65,
+	0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x09, 0x41, 0x72,
-	0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61,
-	0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x72, 0x74, 0x69, 0x73, 0x74, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0a, 0x41, 0x72, 0x74,
-	0x03, 0x6d, 0x73, 0x67, 0x22, 0x5e, 0x0a, 0x17, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
+	0x77, 0x6f, 0x72, 0x6b, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x61,
-	0x4c, 0x69, 0x73, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79,
-	0x1d, 0x0a, 0x09, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x29,
-	0x28, 0x09, 0x52, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x12,
+	0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
-	0x0a, 0x04, 0x50, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x01,
-	0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x76, 0x0a, 0x17, 0x43, 0x6f, 0x6e,
-	0x03, 0x6e, 0x75, 0x6d, 0x22, 0x5a, 0x0a, 0x17, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x52, 0x65, 0x71,
-	0x4c, 0x69, 0x73, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x09, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69,
-	0x2d, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x5f,
-	0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43,
+	0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20,
-	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10,
+	0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x50,
-	0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67,
+	0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12,
-	0x22, 0x7a, 0x0a, 0x13, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74,
+	0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x75,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x09, 0x41, 0x72, 0x74, 0x69, 0x73,
+	0x6d, 0x22, 0x5a, 0x0a, 0x17, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73,
-	0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x72, 0x74, 0x69,
+	0x74, 0x4d, 0x67, 0x6d, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x2d, 0x0a, 0x04,
-	0x73, 0x74, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53, 0x69,
+	0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x61, 0x72, 0x74,
-	0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69,
+	0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74,
-	0x7a, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x72, 0x61, 0x63, 0x74, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x4d,
-	0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18,
+	0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x7a, 0x0a,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x56, 0x0a, 0x13,
+	0x13, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
-	0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70,
+	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, 0x56, 0x0a, 0x13, 0x43, 0x6f, 0x6e,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64,
+	0x12, 0x2d, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19,
+	0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 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, 0xb2, 0x02, 0x0a, 0x13, 0x53, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61,
+	0x63, 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, 0x21, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x74,
+	0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x54,
+	0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65,
+	0x6e, 0x12, 0x1b, 0x0a, 0x08, 0x48, 0x74, 0x6d, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x74, 0x6d, 0x6c, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x19,
+	0x0a, 0x07, 0x45, 0x6e, 0x76, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x65, 0x6e, 0x76, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0a, 0x56, 0x69, 0x65,
+	0x77, 0x50, 0x64, 0x66, 0x55, 0x72, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x76,
+	0x69, 0x65, 0x77, 0x5f, 0x70, 0x64, 0x66, 0x5f, 0x75, 0x72, 0x6c, 0x12, 0x21, 0x0a, 0x0b, 0x44,
+	0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x72, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0c, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x72, 0x6c, 0x12, 0x1f,
+	0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4e, 0x6f, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x6e, 0x6f, 0x12,
+	0x25, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64,
+	0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x22, 0x42, 0x0a, 0x13, 0x53, 0x69, 0x67, 0x6e, 0x43, 0x6f,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x19, 0x0a,
+	0x07, 0x4a, 0x75, 0x6d, 0x70, 0x55, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x6a, 0x75, 0x6d, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x61, 0x0a, 0x15, 0x46, 0x69,
+	0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x72, 0x61, 0x6e,
+	0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x0b, 0x43, 0x6f,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x75, 0x69, 0x64, 0x22, 0x5b, 0x0a,
+	0x15, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x30, 0x0a, 0x08, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73,
+	0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x73, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x6e, 0x0a, 0x15, 0x43, 0x6f,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x02, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 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, 0x58, 0x0a, 0x15, 0x43, 0x6f,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70,
 	0x6f, 0x6e, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28,
 	0x0b, 0x32, 0x19, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x73, 0x52, 0x04, 0x64, 0x61,
+	0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x73, 0x52, 0x04, 0x44, 0x61,
 	0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6d, 0x73, 0x67, 0x22, 0xb2, 0x02, 0x0a, 0x13, 0x53, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x6e,
+	0x03, 0x6d, 0x73, 0x67, 0x22, 0x49, 0x0a, 0x23, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x09,
+	0x61, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x74, 0x55, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0b, 0x43,
-	0x0a, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x0b, 0x43,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22,
-	0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x75, 0x69, 0x64, 0x12, 0x14,
+	0x66, 0x0a, 0x23, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x6e,
-	0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74,
+	0x66, 0x6f, 0x42, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x52,
-	0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1b, 0x0a, 0x08, 0x48, 0x74, 0x6d, 0x6c, 0x54, 0x79, 0x70, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x74, 0x6d, 0x6c, 0x5f, 0x74, 0x79, 0x70,
-	0x65, 0x12, 0x19, 0x0a, 0x07, 0x45, 0x6e, 0x76, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x08, 0x65, 0x6e, 0x76, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0a,
-	0x56, 0x69, 0x65, 0x77, 0x50, 0x64, 0x66, 0x55, 0x72, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x76, 0x69, 0x65, 0x77, 0x5f, 0x70, 0x64, 0x66, 0x5f, 0x75, 0x72, 0x6c, 0x12, 0x21,
-	0x0a, 0x0b, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x72, 0x6c, 0x18, 0x07, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x72,
-	0x6c, 0x12, 0x1f, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4e, 0x6f, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f,
-	0x6e, 0x6f, 0x12, 0x25, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
-	0x6e, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x22, 0x42, 0x0a, 0x13, 0x53, 0x69, 0x67,
-	0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64,
-	0x12, 0x19, 0x0a, 0x07, 0x4a, 0x75, 0x6d, 0x70, 0x55, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x6a, 0x75, 0x6d, 0x70, 0x5f, 0x75, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x4d,
-	0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x61, 0x0a,
-	0x15, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74,
-	0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x12, 0x21, 0x0a,
-	0x0b, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x75, 0x69, 0x64,
-	0x22, 0x5b, 0x0a, 0x15, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x30, 0x0a, 0x08, 0x43, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x61, 0x72,
-	0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x73, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x4d,
-	0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x6e, 0x0a,
-	0x15, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x08, 0x50, 0x61, 0x67, 0x65, 0x53, 0x69,
-	0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73,
-	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, 0x58, 0x0a,
-	0x15, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x4c, 0x69, 0x73, 0x74, 0x52,
 	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
 	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x73, 0x52,
-	0x04, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x49, 0x0a, 0x23, 0x47, 0x65, 0x74, 0x43, 0x6f,
+	0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x24, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x43, 0x6f,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x43, 0x6f, 0x6e, 0x74,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a,
-	0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22,
+	0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0xfd, 0x03,
-	0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
-	0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x6e, 0x61,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20,
-	0x6d, 0x65, 0x22, 0x66, 0x0a, 0x23, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49,
-	0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12,
-	0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x44, 0x61, 0x74,
+	0x16, 0x0a, 0x06, 0x43, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74,
+	0x06, 0x63, 0x61, 0x72, 0x64, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x67, 0x6d, 0x74, 0x55,
-	0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x67, 0x6d,
-	0x74, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x18,
+	0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x72, 0x74, 0x77, 0x6f,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x22, 0x24, 0x0a, 0x12, 0x47, 0x65,
+	0x72, 0x6b, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x72, 0x74, 0x77,
-	0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x6f, 0x72, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64,
+	0x74, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x22, 0xfd, 0x03, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72,
+	0x61, 0x63, 0x74, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
-	0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44,
+	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x72,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73,
+	0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x54,
-	0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72,
+	0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12,
-	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x43, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01,
+	0x18, 0x0a, 0x07, 0x42, 0x61, 0x74, 0x63, 0x68, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03,
-	0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x67,
+	0x52, 0x07, 0x62, 0x61, 0x74, 0x63, 0x68, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61, 0x74,
-	0x6d, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x61,
-	0x6d, 0x67, 0x6d, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x41, 0x72,
+	0x74, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x56, 0x69, 0x65, 0x77, 0x55,
-	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61,
+	0x72, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x69, 0x65, 0x77, 0x55, 0x72,
-	0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x74,
+	0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x72, 0x6c,
-	0x72, 0x61, 0x63, 0x74, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f,
+	0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e,
+	0x55, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0d, 0x20, 0x01,
-	0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x55, 0x70, 0x64,
-	0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x12,
+	0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x75,
-	0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x79,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x72, 0x65,
-	0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x42, 0x61, 0x74, 0x63, 0x68, 0x49, 0x64, 0x18, 0x09, 0x20,
+	0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63,
-	0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x61, 0x74, 0x63, 0x68, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x45, 0x78, 0x70,
-	0x42, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28,
-	0x09, 0x62, 0x61, 0x74, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x56, 0x69,
+	0x09, 0x52, 0x0e, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d,
-	0x65, 0x77, 0x55, 0x72, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x69, 0x65,
+	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x11, 0x20,
-	0x77, 0x55, 0x72, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x17, 0x0a,
-	0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x6f, 0x77, 0x6e, 0x6c,
+	0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52,
-	0x6f, 0x61, 0x64, 0x55, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x4f, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
+	0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09,
+	0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69,
-	0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
+	0x64, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
-	0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x45, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x10,
+	0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x6e, 0x64, 0x32, 0xe3, 0x05, 0x0a, 0x0e, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
-	0x54, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x60, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43,
-	0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x25, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74,
-	0x22, 0x17, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61,
+	0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43,
-	0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x4f, 0x0a, 0x17, 0x55, 0x70, 0x64,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25,
-	0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x02, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x72, 0x61,
-	0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x64, 0x32, 0xe3, 0x05, 0x0a, 0x0e, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74,
-	0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x60, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61,
-	0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x25, 0x2e, 0x61, 0x72, 0x74,
-	0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61,
-	0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x25, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x66, 0x0a, 0x10, 0x43, 0x6f,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x12, 0x27,
 	0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
-	0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x67, 0x6d, 0x74,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74,
+	0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x66, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x74, 0x72,
-	0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x12, 0x27, 0x2e, 0x61, 0x72,
-	0x74, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64,
+	0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e,
-	0x22, 0x00, 0x12, 0x5a, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x52, 0x65, 0x71,
-	0x73, 0x74, 0x12, 0x23, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
-	0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74,
+	0x73, 0x74, 0x4d, 0x67, 0x6d, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12,
-	0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x5a, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12,
-	0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x5a,
+	0x23, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
-	0x0a, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x23,
+	0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
-	0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
-	0x53, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x4c, 0x69,
-	0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74,
+	0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x5a, 0x0a, 0x0c, 0x53,
-	0x72, 0x61, 0x63, 0x74, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x69, 0x67, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x23, 0x2e, 0x61, 0x72,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x0e, 0x46, 0x69,
+	0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x53, 0x69, 0x67,
-	0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x25, 0x2e, 0x61,
+	0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x46, 0x69,
+	0x1a, 0x23, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x74, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65,
-	0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74,
+	0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x69, 0x73,
-	0x72, 0x61, 0x63, 0x74, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72,
+	0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x25, 0x2e, 0x61, 0x72, 0x74, 0x69,
-	0x61, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x0e,
+	0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73,
-	0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x25,
+	0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
+	0x1a, 0x25, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
+	0x74, 0x2e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x0e, 0x43, 0x6f, 0x6e,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x61, 0x72,
-	0x78, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x8a,
+	0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e,
-	0x01, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x6e,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x66, 0x6f, 0x42, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x12,
+	0x73, 0x74, 0x1a, 0x25, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72,
-	0x33, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
+	0x61, 0x63, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54, 0x78, 0x4c, 0x69,
-	0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f,
+	0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x12, 0x8a, 0x01, 0x0a, 0x1c,
-	0x42, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x52, 0x65, 0x71,
+	0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x33, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e,
+	0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x12, 0x33, 0x2e, 0x61,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x47, 0x65,
-	0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55,
+	0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x43,
-	0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x42, 0x13, 0x5a, 0x11, 0x2e,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x2f, 0x3b, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
+	0x74, 0x1a, 0x33, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x74, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x6e,
+	0x66, 0x6f, 0x42, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x55, 0x69, 0x64, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x22, 0x00, 0x42, 0x13, 0x5a, 0x11, 0x2e, 0x2f, 0x3b, 0x61,
+	0x72, 0x74, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/contract/contract.proto

@@ -31,6 +31,9 @@ message Contracts{
    string ExpirationTime = 11 [json_name = "expiration_time"];
    string LockTime = 12 [json_name = "lock_time"];
    string SignTime = 13 [json_name = "sign_time"];
+   string BatchTime = 14 [json_name = "batch_time"];
+   string BatchUid = 15 [json_name = "batch_uid"];
+   int32 StType = 16 [json_name = "st_yype"];
 }
 
 message CreateContractRequest {
@@ -45,8 +48,9 @@ message CreateContractRespond{
 
 message ContractListMgmtRequest{
    string ArtistUid = 1 [json_name = "artist_uid"];
-   int32 Page = 2 [json_name = "page"];
+   int32 Status = 2 [json_name = "status"];
-   int32 Num = 3 [json_name = "num"];
+   int32 Page = 3 [json_name = "page"];
+   int32 Num = 4 [json_name = "num"];
 }
 
 message ContractListMgmtRespond{
@@ -59,7 +63,6 @@ message ContractListRequest {
    int32 PageSize = 2  [json_name="pageSize"];
    int32 Page = 3 [json_name="page"];
    int32 State = 4 [json_name="state"];
- 
 }
 
 message ContractListRespond {

pkg/db/init.go

@@ -121,9 +121,12 @@ func migration() {
 		&model.ArtshowArtistIndex{},      //画展-画家指数
 		&model.ArtshowArtistSupplement{}, //画展-画家补充信息
 		&model.Contract{},                //合同
-		&model.StatementBatch{},          //对账单批次
+		&model.ArtworkTx{},               //对账单画作物权
-		&model.ArtworkEntrustDetail{},    //
+		&model.ArtworkTxDetail{},         //对账单画作物权委托详情
-		&model.ArtworkSalesDetail{},      //
+		&model.ArtworkSoldTxDetail{},     //对账单画作物权销售委托详情
+		&model.ArtworkCopy{},             //对账单画作版权
+		&model.ArtworkCopyDetail{},       //对账单画作版权委托详情
+		&model.ArtworkSoldCopyDetail{},   //对账单画作版权委托售卖详情
 	)
 	if err != nil {
 		fmt.Println("register table fail")