From 68d53191fc570c45dc7fa9922f19b3910ecc4fe3 Mon Sep 17 00:00:00 2001
From: songchuang <192749120@qq.com>
Date: Thu, 16 Mar 2023 16:05:35 +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   |  3 ++-
 cmd/internal/logic/contract.go | 36 ++++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/cmd/internal/dao/contract.go b/cmd/internal/dao/contract.go
index 7a28ee2..d43cd4f 100644
--- a/cmd/internal/dao/contract.go
+++ b/cmd/internal/dao/contract.go
@@ -15,7 +15,8 @@ import (
 )
 
 func GetArtistInfoByArtistUid(artistUid string) (user model.User, err error) {
-	if err = db.DB.Where("mgmt_artist_uid = ?", artistUid).First(&user).Error; err != nil {
+
+	if err = db.DB.Where("mgmt_acc_id = ?", artistUid).Preload("RealNameInfo").Find(&user).Error; err != nil {
 		zap.L().Error("get user info err", zap.Error(err))
 		err = errors.New(m.ERROR_SELECT)
 		return
diff --git a/cmd/internal/logic/contract.go b/cmd/internal/logic/contract.go
index 681abf7..a131b1e 100644
--- a/cmd/internal/logic/contract.go
+++ b/cmd/internal/logic/contract.go
@@ -209,10 +209,16 @@ func (a *Contract) SignContract(req *contract.SignContractRequest) (rep *contrac
 		return
 	}
 
-	//根据画家id获取画家具体信息
-	artistDetailResponse, customerId, err := GetArtistInfoById(req.ArtistUid)
+	// //根据画家id获取画家具体信息
+	// artistDetailResponse, customerId, err := GetArtistInfoById(req.ArtistUid)
+	// if err != nil {
+	// 	return rep, err
+	// }
+
+	//返回画家信息
+	artistDetailResponse, err := dao.GetArtistInfoByArtistUid(req.ArtistUid)
 	if err != nil {
-		return rep, err
+		return
 	}
 
 	if contractInfo.Type != 4 && contractInfo.Type != 7 {
@@ -224,10 +230,10 @@ func (a *Contract) SignContract(req *contract.SignContractRequest) (rep *contrac
 			parameterMap := make((map[string]string), 0)
 
 			// 一、 模板填充
-			parameterMap["PartyAName"] = artistDetailResponse.ProfileInfo.Name
-			parameterMap["PartyAAddress"] = artistDetailResponse.ProfileInfo.Address
-			parameterMap["PartyAIdentityCard"] = artistDetailResponse.ProfileInfo.CardId
-			parameterMap["PartyATelNum"] = artistDetailResponse.ProfileInfo.Phone
+			parameterMap["PartyAName"] = artistDetailResponse.RealNameInfo.Name
+			parameterMap["PartyAAddress"] = artistDetailResponse.RealNameInfo.Address
+			parameterMap["PartyAIdentityCard"] = artistDetailResponse.RealNameInfo.IdNum
+			parameterMap["PartyATelNum"] = artistDetailResponse.RealNameInfo.TelNum
 			parameterMap["PartyBRule"] = "240"
 			parameterMap["SettleNum"] = "2"
 			parameterMap["SettleSec"] = "100"
@@ -287,10 +293,10 @@ func (a *Contract) SignContract(req *contract.SignContractRequest) (rep *contrac
 			var parameterMap = make(map[string]string)
 			endTime := time.Now().AddDate(1, 0, -1)
 			parameterMap["ContractNo"] = ContractNo
-			parameterMap["PartyAName"] = artistDetailResponse.ProfileInfo.Name
-			parameterMap["PartyAAddress"] = artistDetailResponse.ProfileInfo.Address
-			parameterMap["PartyAIdentityCard"] = artistDetailResponse.ProfileInfo.CardId
-			parameterMap["PartyATelNum"] = artistDetailResponse.ProfileInfo.Phone
+			parameterMap["PartyAName"] = artistDetailResponse.RealNameInfo.Name
+			parameterMap["PartyAAddress"] = artistDetailResponse.RealNameInfo.Address
+			parameterMap["PartyAIdentityCard"] = artistDetailResponse.RealNameInfo.IdNum
+			parameterMap["PartyATelNum"] = artistDetailResponse.RealNameInfo.TelNum
 			parameterMap["SettleNum"] = "2"
 			parameterMap["SettleSecOne"] = "0"
 			parameterMap["SettleSecTwo"] = "100"
@@ -354,8 +360,8 @@ func (a *Contract) SignContract(req *contract.SignContractRequest) (rep *contrac
 			}
 
 			var parameterMap = make(map[string]string)
-			parameterMap["PartyAName"] = artistDetailResponse.ProfileInfo.Name
-			parameterMap["PartyAIdCard"] = artistDetailResponse.ProfileInfo.CardId
+			parameterMap["PartyAName"] = artistDetailResponse.RealNameInfo.Name
+			parameterMap["PartyAIdCard"] = artistDetailResponse.RealNameInfo.IdNum
 			parameterMap["ArtworkName"] = artworkDetailResponse.ProfileInfo.ArtworkName
 			parameterMap["Year"] = fmt.Sprintf("%d", time.Now().Year())
 			parameterMap["Month"] = fmt.Sprintf("%d", time.Now().Month())
@@ -474,7 +480,7 @@ func (a *Contract) SignContract(req *contract.SignContractRequest) (rep *contrac
 
 			//一、 模板填充
 			var parameterMap = make(map[string]string)
-			parameterMap["PartyBLegal"] = artistDetailResponse.ProfileInfo.Name
+			parameterMap["PartyBLegal"] = artistDetailResponse.RealNameInfo.Name
 
 			//将map转换为string类型
 			parameterMapType, err := json.Marshal(parameterMap)
@@ -579,7 +585,7 @@ func (a *Contract) SignContract(req *contract.SignContractRequest) (rep *contrac
 	extSignRequest := &contractMicroservice.ExtSignRequest{
 		TransactionId:     transactionId,
 		ContractId:        contractInfo.ContractId,
-		CustomerId:        customerId,
+		CustomerId:        artistDetailResponse.CustomerId,
 		ReturnUrl:         fmt.Sprintf("%v/contractwrite?htmltype=%s&envtype=%s&token= %s", "192.168.10.7", req.HtmlType, req.EnvType, req.Token),
 		DocTitle:          contractInfo.ContractId,
 		OpenEnvironment:   "0",