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 13:44:14 +08:00
parent f4cf06081d
commit ffdc7f3a61
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,7 +197,7 @@ func CreateArtworkSoldCopyDetail(tx *gorm.DB, uid1, uid2 string, excelTwoInfo *s
} }
func GetAllBatchTimeTx() (batchTime []string, err error) { func GetAllBatchTimeTx() (batchTime []string, err error) {
if err = db.DB.Where("DISTINCT batch_time").Find(&model.ArtworkTx{}).Pluck("batch_time", &batchTime).Error; err != nil { if err = db.DB.Distinct("batch_time").Find(&model.ArtworkTx{}).Pluck("batch_time", &batchTime).Error; err != nil {
zap.L().Error("get artworkTxList info err", zap.Error(err)) zap.L().Error("get artworkTxList info err", zap.Error(err))
err = errors.New(m.ERROR_SELECT) err = errors.New(m.ERROR_SELECT)
return return
@ -206,7 +206,7 @@ func GetAllBatchTimeTx() (batchTime []string, err error) {
} }
func GetAllBatchTimeCopy() (batchTime []string, err error) { func GetAllBatchTimeCopy() (batchTime []string, err error) {
if err = db.DB.Where("DISTINCT batch_time").Find(&model.ArtworkCopy{}).Pluck("batch_time", &batchTime).Error; err != nil { if err = db.DB.Distinct("batch_time").Find(&model.ArtworkCopy{}).Pluck("batch_time", &batchTime).Error; err != nil {
zap.L().Error("get artworkTxList info err", zap.Error(err)) zap.L().Error("get artworkTxList info err", zap.Error(err))
err = errors.New(m.ERROR_SELECT) err = errors.New(m.ERROR_SELECT)
return return

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

@ -1,8 +1,6 @@
package logic package logic
import ( import (
"fmt"
"github.com/fonchain/fonchain-artistinfo/cmd/internal/dao" "github.com/fonchain/fonchain-artistinfo/cmd/internal/dao"
statement "github.com/fonchain/fonchain-artistinfo/pb/artistinfoStatement" statement "github.com/fonchain/fonchain-artistinfo/pb/artistinfoStatement"
db "github.com/fonchain/fonchain-artistinfo/pkg/db" db "github.com/fonchain/fonchain-artistinfo/pkg/db"
@ -31,7 +29,7 @@ type Statement struct {
func (a *Statement) UploadExcelOneTx(req *statement.UploadExcelOneTxRequest) (rep *statement.UploadExcelOneTxRespond, err error) { func (a *Statement) UploadExcelOneTx(req *statement.UploadExcelOneTxRequest) (rep *statement.UploadExcelOneTxRespond, err error) {
rep = &statement.UploadExcelOneTxRespond{} rep = &statement.UploadExcelOneTxRespond{}
fmt.Println("req.ExcelOneInfo", req.ExcelOneInfo)
//开启事务，遇到错误就回滚 //开启事务，遇到错误就回滚
tx := db.DB.Begin() tx := db.DB.Begin()
defer func() { defer func() {
@ -113,13 +111,8 @@ func (a *Statement) UploadExcelTwoTx(req *statement.UploadExcelTwoTxRequest) (re
return rep, err return rep, err
} }
fmt.Println("exist", exist)
fmt.Println("artworkTx", artworkTx)
fmt.Println("artworkTx", artworkTx)
//没有的就生成物权批次 //没有的就生成物权批次
if exist { if exist {
fmt.Println("第一处")
//获取批次uid //获取批次uid
uid1, err := util.GetUid() uid1, err := util.GetUid()
@ -131,7 +124,7 @@ func (a *Statement) UploadExcelTwoTx(req *statement.UploadExcelTwoTxRequest) (re
if err != nil { if err != nil {
return rep, err return rep, err
} }
fmt.Println("第二处")
//对账单画作物权委托详情uid //对账单画作物权委托详情uid
uid2, err := util.GetUid() uid2, err := util.GetUid()
if err != nil { if err != nil {
@ -143,18 +136,17 @@ func (a *Statement) UploadExcelTwoTx(req *statement.UploadExcelTwoTxRequest) (re
return rep, err return rep, err
} }
} else { } else {
fmt.Println("第三处")
//查看画作是否已经被该批次录入过，被录入过就跳过 //查看画作是否已经被该批次录入过，被录入过就跳过
count, err := dao.IsExistArtworkSoldTxDetail(tx, artworkTx.Uid, v.TfNum) count, err := dao.IsExistArtworkSoldTxDetail(tx, artworkTx.Uid, v.TfNum)
if err != nil { if err != nil {
return rep, err return rep, err
} }
fmt.Println("count", count)
fmt.Println("err", err)
if count != 0 { if count != 0 {
continue continue
} }
fmt.Println("第四处")
//获取批次uid //获取批次uid
uid, err := util.GetUid() uid, err := util.GetUid()
if err != nil { if err != nil {
@ -164,7 +156,6 @@ func (a *Statement) UploadExcelTwoTx(req *statement.UploadExcelTwoTxRequest) (re
if err != nil { if err != nil {
return rep, err return rep, err
} }
fmt.Println("第五处")
} }
} }