Merge branch 'songchuang' into dev

This commit is contained in:
songchuang 2023-03-23 11:45:47 +08:00
commit 1b5a52df12

View File

@ -19,24 +19,24 @@ type Contract struct {
SignTime string `gorm:"column:sign_time;comment:签署时间" json:"sign_time"`
BatchName string `gorm:"column:batch_name;comment:批次名" json:"batch_name"`
StType int32 `gorm:"column:st_type;unqiueIndex:sttype_uid_batchtime_idx;comment:对账单类型 1=版权 2=物权;"`
BatchId int32 `gorm:"column:batch_id;comment:批次ID" json:"batch_id"`
ArtworkInfo []ArtworkStatementDetail `gorm:"column:artwork_info;foreignKey:BatchId;references:ID"` //当前批次的委托单详情
ArtworkInfo []ArtworkStatementDetail `gorm:"column:artwork_info;foreignKey:Uid;references:BatchUid"` //当前批次的委托单详情
CreatedAt int32 `gorm:"column:created_at;autoCreateTime"`
UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"`
DeletedAt soft_delete.DeletedAt
}
// 对账单画作委托详情
// 对账单画作物权委托详情
type ArtworkStatementDetail struct {
Model
Uid string `gorm:"column:uid;type:varchar(100);comment:对账单画作详情表的唯一表示;NOT NULL" json:"uid"`
BatchId int64 `gorm:"column:batch_id;unqiueIndex:batchid_tfnum_idx;comment:批次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;"`
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:已收取保证金;"`
}