From 1af745879c4381a9d30c6c101f4ae73ab152fc79 Mon Sep 17 00:00:00 2001
From: songchuang <192749120@qq.com>
Date: Wed, 15 Mar 2023 15:25:05 +0800
Subject: [PATCH] =?UTF-8?q?contract=20=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/internal/dao/contract.go   |  9 +++++++--
 cmd/internal/logic/contract.go | 36 ++++++++++++++++++++++------------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/cmd/internal/dao/contract.go b/cmd/internal/dao/contract.go
index 97b83a4..4011a3f 100644
--- a/cmd/internal/dao/contract.go
+++ b/cmd/internal/dao/contract.go
@@ -2,6 +2,7 @@ package dao
 
 import (
 	"errors"
+	"fmt"
 	"strings"
 
 	"github.com/fonchain/fonchain-artistinfo/cmd/model"
@@ -21,6 +22,10 @@ func GetMgmtContractByArtistUid(artistUid string, contractType int32) (err error
 		return
 	}
 
+	//err 为空则查询到，返回画作合同已存在的错误
+	if err == nil {
+		err = errors.New(m.ARTWORK_CONTRACT_EXISTS)
+	}
 	return
 }
 
@@ -92,11 +97,11 @@ func GetContractList(artistUid string, pageSize, offset int32) (contracts []*con
 
 	var contractSlice []model.Contract
 	if err = db.DB.Where("artist_uid = ?", artistUid).Order("ID asc").Limit(int(pageSize)).Offset(int(offset)).Find(&contractSlice).Error; err != nil {
-		zap.L().Error("create contracts info err", zap.Error(err))
+		zap.L().Error("get contracts info err", zap.Error(err))
 		err = errors.New(m.CREATE_ERROR)
 		return
 	}
-
+	fmt.Println("第二处")
 	for _, v := range contractSlice {
 		contcontract := &contract.Contracts{
 			ContractUid:   v.Uid,
diff --git a/cmd/internal/logic/contract.go b/cmd/internal/logic/contract.go
index 4c4e40e..4d13b9a 100644
--- a/cmd/internal/logic/contract.go
+++ b/cmd/internal/logic/contract.go
@@ -54,6 +54,10 @@ func (a *Contract) CreateContract(req *contract.CreateContractRequest) (rep *con
 		IsArtist:      true,
 	})
 
+	fmt.Println("第一处")
+	fmt.Println("userInfo:", userInfo)
+	fmt.Println("req:", req)
+
 	if err != nil {
 		return
 	}
@@ -124,12 +128,11 @@ func (a *Contract) CreateContract(req *contract.CreateContractRequest) (rep *con
 			} else {
 				return
 			}
-
-			//创建画家画作合同，类型3
-			if err = dao.CreateArtworkContract(tx, req.ArtworkUid, req.ArtistUid, 3, userInfo.LatestLockTime); err != nil {
-				tx.Rollback()
-				return
-			}
+		}
+		//创建画家画作合同，类型3
+		if err = dao.CreateArtworkContract(tx, req.ArtworkUid, req.ArtistUid, 3, userInfo.LatestLockTime); err != nil {
+			tx.Rollback()
+			return
 		}
 
 	case 5:
@@ -139,11 +142,11 @@ func (a *Contract) CreateContract(req *contract.CreateContractRequest) (rep *con
 			} else {
 				return
 			}
-			//创建画家画作合同，类型3
-			if err = dao.CreateArtworkContract(tx, req.ArtworkUid, req.ArtistUid, 5, userInfo.LatestLockTime); err != nil {
-				tx.Rollback()
-				return
-			}
+		}
+		//创建画家画作合同，类型3
+		if err = dao.CreateArtworkContract(tx, req.ArtworkUid, req.ArtistUid, 5, userInfo.LatestLockTime); err != nil {
+			tx.Rollback()
+			return
 		}
 
 	default:
@@ -157,8 +160,17 @@ func (a *Contract) CreateContract(req *contract.CreateContractRequest) (rep *con
 
 func (a *Contract) ContractListMgmt(req *contract.ContractListMgmtRequest) (rep *contract.ContractListMgmtRespond, err error) {
 	rep = &contract.ContractListMgmtRespond{}
+
 	//查看是否有该画家
-	if err = dao.GetArtistNoByUid(req.ArtistUid); err != nil {
+	userInfo, err := NewArtistInfo().FindUser(&artistInfoUser.FindUserRequest{
+		MgmtArtistUid: req.ArtistUid,
+		IsArtist:      true,
+	})
+
+	if err != nil {
+		return
+	}
+	if userInfo.Id == 0 {
 		return
 	}