jjxu/fonchain-artistinfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

对账单测试代码提交

Browse Source
This commit is contained in:
songchuang 2023-04-19 11:16:58 +08:00
parent ef3b719a9d
commit a6d30beca2
3 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/internal/dao/statement.go
View File

@ -2,6 +2,7 @@ package dao
import ( import (
"errors" "errors"
"fmt"
"github.com/fonchain/fonchain-artistinfo/cmd/model" "github.com/fonchain/fonchain-artistinfo/cmd/model"
statement "github.com/fonchain/fonchain-artistinfo/pb/artistinfoStatement" statement "github.com/fonchain/fonchain-artistinfo/pb/artistinfoStatement"
@ -152,6 +153,8 @@ func IsExistArtworkSoldCopyDetail(tx *gorm.DB, uid, tfNum string) (count int64,
} }
func CreateArtworkSoldTxDetail(tx *gorm.DB, uid1, uid2 string, excelTwoInfo *statement.ExcelTwoInfo) (err error) { func CreateArtworkSoldTxDetail(tx *gorm.DB, uid1, uid2 string, excelTwoInfo *statement.ExcelTwoInfo) (err error) {
fmt.Println("excelTwoInfo:", excelTwoInfo)
fmt.Println("excelTwoInfo.CompleteDate:", excelTwoInfo.CompleteDate)
artworkSoldTxDetail := &model.ArtworkSoldTxDetail{ artworkSoldTxDetail := &model.ArtworkSoldTxDetail{
Uid: uid2, Uid: uid2,
BatchUid: uid1, //批次uid BatchUid: uid1, //批次uid

2
cmd/internal/logic/statement.go
View File

@ -595,9 +595,7 @@ func (a *Statement) GetCopyInfoByBatchUid(req *statement.GetCopyInfoByBatchUidRe
artworkSoldCopyDetail.Ruler = v.Ruler artworkSoldCopyDetail.Ruler = v.Ruler
artworkSoldCopyDetail.SaleNo = v.SaleNo artworkSoldCopyDetail.SaleNo = v.SaleNo
artworkSoldCopyDetail.CompleteDate = v.CompleteDate artworkSoldCopyDetail.CompleteDate = v.CompleteDate
artworkSoldCopyDetail.MinPrice = v.MinPrice
artworkSoldCopyDetail.SalePrice = v.SalePrice artworkSoldCopyDetail.SalePrice = v.SalePrice
artworkSoldCopyDetail.GuaranteePrice = v.GuaranteePrice
rep.ArtworkSoldCopyDetail = append(rep.ArtworkSoldCopyDetail, artworkSoldCopyDetail) rep.ArtworkSoldCopyDetail = append(rep.ArtworkSoldCopyDetail, artworkSoldCopyDetail)
} }

58
cmd/model/statement.go
View File

@ -25,11 +25,11 @@ type ArtworkTxDetail 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"`
BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次Uid;NOT NULL" json:"batch_uid"` BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次Uid;NOT NULL" json:"batch_uid"`
TfNum string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号"` TfNum string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号" json:"tf_num"`
ArtworkName string `gorm:"column:artwork_name;comment:画作名称"` ArtworkName string `gorm:"column:artwork_name;comment:画作名称" json:"artwork_name"`
Ruler float32 `gorm:"column:ruler;comment:平尺"` Ruler float32 `gorm:"column:ruler;comment:平尺" json:"ruler"`
MinPrice float32 `gorm:"column:min_price;comment:委托销售底价"` MinPrice float32 `gorm:"column:min_price;comment:委托销售底价" json:"min_price"`
GuaranteePrice float32 `gorm:"column:guarantee_price;comment:已收取保证金;"` GuaranteePrice float32 `gorm:"column:guarantee_price;comment:已收取保证金;" json:"guarantee_price"`
CreatedAt int32 `gorm:"column:created_at;autoCreateTime"` CreatedAt int32 `gorm:"column:created_at;autoCreateTime"`
UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"` UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"`
DeletedAt soft_delete.DeletedAt DeletedAt soft_delete.DeletedAt
@ -40,12 +40,12 @@ type ArtworkSoldTxDetail 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"`
BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次Uid;NOT NULL" json:"batch_uid"` BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作物权表的唯一表示,即批次Uid;NOT NULL" json:"batch_uid"`
TfNum string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号"` TfNum string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号" json:"tf_num"`
ArtworkName string `gorm:"column:artwork_name;comment:画作名称"` ArtworkName string `gorm:"column:artwork_name;comment:画作名称" json:"artwork_name"`
Ruler float32 `gorm:"column:ruler;comment:平尺"` Ruler float32 `gorm:"column:ruler;comment:平尺" json:"ruler"`
SaleNo string `gorm:"column:sale_no;comment:销售单号"` SaleNo string `gorm:"column:sale_no;comment:销售单号" json:"sale_no"`
CompleteDate string `gorm:"column:complete_date;comment:成交日期"` CompleteDate string `gorm:"column:complete_date;comment:成交日期" json:"complete_date"`
SalePrice float32 `gorm:"column:sale_price;comment:画作售价"` SalePrice float32 `gorm:"column:sale_price;comment:画作售价" json:"sale_price"`
CreatedAt int32 `gorm:"column:created_at;autoCreateTime"` CreatedAt int32 `gorm:"column:created_at;autoCreateTime"`
UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"` UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"`
DeletedAt soft_delete.DeletedAt DeletedAt soft_delete.DeletedAt
@ -69,11 +69,11 @@ type ArtworkCopyDetail 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"`
BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作版权表的唯一表示,即批次Uid;NOT NULL" json:"batch_uid"` BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作版权表的唯一表示,即批次Uid;NOT NULL" json:"batch_uid"`
TfNum string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号"` TfNum string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号" json:"tf_num"`
ArtworkName string `gorm:"column:artwork_name;comment:画作名称"` ArtworkName string `gorm:"column:artwork_name;comment:画作名称" json:"tf_num"`
Ruler float32 `gorm:"column:ruler;comment:平尺"` Ruler float32 `gorm:"column:ruler;comment:平尺" json:"ruler"`
MinPrice float32 `gorm:"column:min_price;comment:委托销售底价"` MinPrice float32 `gorm:"column:min_price;comment:委托销售底价" json:"min_price"`
GuaranteePrice float32 `gorm:"column:guarantee_price;comment:已收取保证金;"` GuaranteePrice float32 `gorm:"column:guarantee_price;comment:已收取保证金;" json:"guarantee_price"`
CreatedAt int32 `gorm:"column:created_at;autoCreateTime"` CreatedAt int32 `gorm:"column:created_at;autoCreateTime"`
UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"` UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"`
DeletedAt soft_delete.DeletedAt DeletedAt soft_delete.DeletedAt
@ -81,18 +81,16 @@ type ArtworkCopyDetail struct {
// 对账单画作版权委托售卖详情(该画家一个批次的全部已被售卖了的画作) // 对账单画作版权委托售卖详情(该画家一个批次的全部已被售卖了的画作)
type ArtworkSoldCopyDetail struct { type ArtworkSoldCopyDetail 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"`
BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作版权表的唯一表示,即批次Uid;NOT NULL" json:"batch_uid"` BatchUid string `gorm:"column:batch_uid;type:varchar(100);comment:对账单画作版权表的唯一表示,即批次Uid;NOT NULL" json:"batch_uid"`
TfNum string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号"` TfNum string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号" json:"tf_num"`
ArtworkName string `gorm:"column:artwork_name;comment:画作名称"` ArtworkName string `gorm:"column:artwork_name;comment:画作名称" json:"tf_num"`
Ruler float32 `gorm:"column:ruler;comment:平尺"` Ruler float32 `gorm:"column:ruler;comment:平尺" json:"ruler"`
SaleNo string `gorm:"column:sale_no;comment:销售单号"` SaleNo string `gorm:"column:sale_no;comment:销售单号" json:"sale_no"`
CompleteDate string `gorm:"column:complete_date;comment:成交日期"` CompleteDate string `gorm:"column:complete_date;comment:成交日期" json:"complete_date"`
MinPrice float32 `gorm:"column:min_price;comment:委托销售底价"` SalePrice float32 `gorm:"column:sale_price;comment:画作售价" json:"sale_price"`
SalePrice float32 `gorm:"column:sale_price;comment:画作售价"` CreatedAt int32 `gorm:"column:created_at;autoCreateTime"`
GuaranteePrice float32 `gorm:"column:guarantee_price;comment:已收取保证金;"` UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"`
CreatedAt int32 `gorm:"column:created_at;autoCreateTime"` DeletedAt soft_delete.DeletedAt
UpdatedAt int32 `gorm:"column:updated_at;autoCreateTime"`
DeletedAt soft_delete.DeletedAt
} }