contract 后台部分代码修改
This commit is contained in:
parent
1af745879c
commit
3d803cd860
@ -477,6 +477,7 @@ func FindUser(req *artistInfoUser.FindUserRequest) (rep *artistInfoUser.UserInfo
|
|||||||
InvitationCode: []string{inviterCode.InviteCode},
|
InvitationCode: []string{inviterCode.InviteCode},
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
fmt.Println("AccountProvider.ListByID error", err.Error())
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if len(inviterAccount.Data) > 0 {
|
if len(inviterAccount.Data) > 0 {
|
||||||
|
@ -14,6 +14,16 @@ import (
|
|||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func GetArtistInfoByArtistUid(artistUid string) (user model.User, err error) {
|
||||||
|
if err = db.DB.Where("mgmt_artist_uid = ?", artistUid).First(&user).Error; err != nil {
|
||||||
|
zap.L().Error("get user info err", zap.Error(err))
|
||||||
|
err = errors.New(m.ERROR_SELECT)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
func GetMgmtContractByArtistUid(artistUid string, contractType int32) (err error) {
|
func GetMgmtContractByArtistUid(artistUid string, contractType int32) (err error) {
|
||||||
var contract model.Contract
|
var contract model.Contract
|
||||||
if err = db.DB.Where("artist_uid = ? AND type = ?", artistUid, contractType).First(&contract).Error; err != nil && err != gorm.ErrRecordNotFound {
|
if err = db.DB.Where("artist_uid = ? AND type = ?", artistUid, contractType).First(&contract).Error; err != nil && err != gorm.ErrRecordNotFound {
|
||||||
|
@ -11,7 +11,6 @@ import (
|
|||||||
"github.com/fonchain/fonchain-artistinfo/cmd/internal/dao"
|
"github.com/fonchain/fonchain-artistinfo/cmd/internal/dao"
|
||||||
"github.com/fonchain/fonchain-artistinfo/cmd/model"
|
"github.com/fonchain/fonchain-artistinfo/cmd/model"
|
||||||
"github.com/fonchain/fonchain-artistinfo/pb/artist"
|
"github.com/fonchain/fonchain-artistinfo/pb/artist"
|
||||||
"github.com/fonchain/fonchain-artistinfo/pb/artistInfoUser"
|
|
||||||
"github.com/fonchain/fonchain-artistinfo/pb/artwork"
|
"github.com/fonchain/fonchain-artistinfo/pb/artwork"
|
||||||
contract "github.com/fonchain/fonchain-artistinfo/pb/contract"
|
contract "github.com/fonchain/fonchain-artistinfo/pb/contract"
|
||||||
contractMicroservice "github.com/fonchain/fonchain-artistinfo/pb/contract_microservice"
|
contractMicroservice "github.com/fonchain/fonchain-artistinfo/pb/contract_microservice"
|
||||||
@ -49,22 +48,12 @@ func (a *Contract) CreateContract(req *contract.CreateContractRequest) (rep *con
|
|||||||
//遇到错误数据库回滚
|
//遇到错误数据库回滚
|
||||||
tx := db.DB.Begin()
|
tx := db.DB.Begin()
|
||||||
|
|
||||||
userInfo, err := NewArtistInfo().FindUser(&artistInfoUser.FindUserRequest{
|
userInfo, err := dao.GetArtistInfoByArtistUid(req.ArtistUid)
|
||||||
MgmtArtistUid: req.ArtistUid,
|
|
||||||
IsArtist: true,
|
|
||||||
})
|
|
||||||
|
|
||||||
fmt.Println("第一处")
|
|
||||||
fmt.Println("userInfo:", userInfo)
|
|
||||||
fmt.Println("req:", req)
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if userInfo.Id == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
|
fmt.Println("第二处111111111111111")
|
||||||
switch req.Type {
|
switch req.Type {
|
||||||
//1 画家合同(不涉及画家的画作)
|
//1 画家合同(不涉及画家的画作)
|
||||||
case 1:
|
case 1:
|
||||||
@ -162,17 +151,10 @@ func (a *Contract) ContractListMgmt(req *contract.ContractListMgmtRequest) (rep
|
|||||||
rep = &contract.ContractListMgmtRespond{}
|
rep = &contract.ContractListMgmtRespond{}
|
||||||
|
|
||||||
//查看是否有该画家
|
//查看是否有该画家
|
||||||
userInfo, err := NewArtistInfo().FindUser(&artistInfoUser.FindUserRequest{
|
_, err = dao.GetArtistInfoByArtistUid(req.ArtistUid)
|
||||||
MgmtArtistUid: req.ArtistUid,
|
|
||||||
IsArtist: true,
|
|
||||||
})
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if userInfo.Id == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
//合同分页查询操作
|
//合同分页查询操作
|
||||||
if req.Page < 1 {
|
if req.Page < 1 {
|
||||||
|
Loading…
Reference in New Issue
Block a user