From f5f466c04d683786ecf5c8172e09629c63d55f22 Mon Sep 17 00:00:00 2001 From: songchuang <192749120@qq.com> Date: Thu, 23 Mar 2023 13:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/model/contract.go | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/cmd/model/contract.go b/cmd/model/contract.go index a62d5ba..c2f052c 100644 --- a/cmd/model/contract.go +++ b/cmd/model/contract.go @@ -17,20 +17,31 @@ type Contract struct { Status int32 `gorm:"column:status;default:2;comment:2=锁定 3=解锁" json:"status" ` //跟随用户的锁定和解锁状态,用于控制数据的展示 LockTime string `gorm:"column:lock_time;comment:锁定时间" json:"lockTime"` SignTime string `gorm:"column:sign_time;comment:签署时间" json:"sign_time"` - BatchName string `gorm:"column:batch_name;comment:批次名" json:"batch_name"` - BatchID string `gorm:"column:batch_id;comment:批次ID" json:"batch_id"` + BatchUid string `gorm:"column:batch_uid;comment:批次ID" json:"batch_uid"` StType int32 `gorm:"column:st_type;unqiueIndex:sttype_uid_batchtime_idx;comment:对账单类型 1=版权 2=物权;"` - ArtworkInfo []ArtworkTxDetail `gorm:"foreignKey:BatchID;references:Uid"` //当前批次的物权委托单详情 + ArtworkInfo []ArtworkTxDetail `gorm:"foreignKey:BatchUid;references:BatchUid"` //当前批次的物权委托单详情 CreatedAt int32 `gorm:"column:created_at;autoCreateTime"` UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"` DeletedAt soft_delete.DeletedAt } +//对账单画作物权 +type ArtworkTx struct { + ID int32 `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` + Uid string `gorm:"column:uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次BatchUid;NOT NULL" json:"uid"` + ArtistUid string `gorm:"column:artist_uid;type:varchar(100);comment:画家Uid;NOT NULL" json:"artist_uid"` + ArtistName string `gorm:"column:artist_name;type:varchar(100);comment:画家名;NOT NULL" json:"artist_name"` + BatchName string `gorm:"column:batch_name;comment:批次名" json:"batch_name"` + 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 int64 `gorm:"column:batch_id;unqiueIndex:batchid_tfnum_idx;comment:批次id;"` + BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次BatchUid;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:平尺"`