From cfc57aecba4a62374f6cf97d814af97118c2ad48 Mon Sep 17 00:00:00 2001
From: dorlolo <428192774@qq.com>
Date: Fri, 17 Mar 2023 17:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/model/artworkStatement.go | 45 ++++++++++++++++++++++++-----------
 conf/prod/conf.ini            |  2 +-
 conf/prod/dubbogo.yaml        |  2 +-
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/cmd/model/artworkStatement.go b/cmd/model/artworkStatement.go
index 65fc0ba..d9a0784 100644
--- a/cmd/model/artworkStatement.go
+++ b/cmd/model/artworkStatement.go
@@ -1,25 +1,42 @@
 package model
 
-// 对账单批次
+// 对账单委托画作批次
 type StatementBatch struct {
 	Model
-	StType         int32             `gorm:"column:st_type;unqiueIndex:sttype_uid_batchtime_idx;comment:对账单类型 1=版权 2=物权;"`
-	ArtistUid      string            `gorm:"column:artist_uid;unqiueIndex:sttype_uid_batchtime_idx;comment:画家uid"`
-	ArtistRealName string            `gorm:"column:artist_real_name;comment:画家真实姓名;"`
-	FlowStatus     int32             `gorm:"column:flow_status;default:1;comment:流程状态 1=未生成 2=已生成未签署 3=已签署"`
-	BatchTime      string            `gorm:"column:batch_time;unqiueIndex:sttype_uid_batchtime_idx;comment:批次时间;"`
-	MinPrice       float32           `gorm:"column:min_price;comment:委托销售底价"`
-	GuaranteePrice float32           `gorm:"column:guarantee_price;comment:以收取保证金;"`
-	FileUrl        string            `gorm:"column:file_url,comment:对账单文件地址;"`
-	ArtworkList    []StatementDetail `gorm:"foreignKey:BatchId"`
+	// StType         int32             `gorm:"column:st_type;unqiueIndex:sttype_uid_batchtime_idx;comment:对账单类型 1=版权 2=物权;"`
+	ArtistUid string `gorm:"column:artist_uid;unqiueIndex:sttype_uid_batchtime_idx;comment:画家uid"`
+	// ArtistRealName string `gorm:"column:artist_real_name;comment:画家真实姓名;"`
+	BatchTime  string `gorm:"column:batch_time;unqiueIndex:sttype_uid_batchtime_idx;comment:批次时间;"`
+	FlowStatus int32  `gorm:"column:flow_status;default:1;comment:流程状态 1=未生成 2=已生成未签署 3=已签署"`
+	FileUrl    string `gorm:"column:file_url,comment:对账单文件地址;"`
+
+	EntrustList []ArtworkEntrustDetail `gorm:"foreignKey:BatchId"`
+	SalesList   []ArtworkSalesDetail   `gorm:"foreignKey:BatchId"`
 }
 
 func (StatementBatch) TableName() string {
 	return "statement_batch"
 }
 
-// 对账单批次详情
-type StatementDetail struct {
+// 对账单画作委托详情
+type ArtworkEntrustDetail struct {
+	Model
+	BatchId        int64   `gorm:"column:batch_id;unqiueIndex:batchid_tfnum_idx;comment:批次id;"`
+	TfNum          string  `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号"`
+	ArtworkName    string  `gorm:"column:artwork_name;comment:画作名称"`
+	Ruler          string  `gorm:"column:ruler;comment:平尺"`
+	SaleNo         string  `gorm:"column:sale_no;comment:销售单号"`
+	CompleteDate   string  `gorm:"column:complete_date;comment:成交日期"`
+	MinPrice       float32 `gorm:"column:min_price;comment:委托销售底价"`
+	GuaranteePrice float32 `gorm:"column:guarantee_price;comment:已收取保证金;"`
+}
+
+func (ArtworkEntrustDetail) TableName() string {
+	return "artwork_entrust_detail"
+}
+
+//对账单画作销售详情
+type ArtworkSalesDetail struct {
 	Model
 	BatchId      int64  `gorm:"column:batch_id;unqiueIndex:batchid_tfnum_idx;comment:批次id;"`
 	TfNum        string `gorm:"column:tf_num;unqiueIndex:batchid_tfnum_idx;comment:"泰丰画作编号"`
@@ -29,6 +46,6 @@ type StatementDetail struct {
 	CompleteDate string `gorm:"column:complete_date;comment:成交日期"`
 }
 
-func (StatementDetail) TableName() string {
-	return "statement_detail"
+func (ArtworkSalesDetail) TableName() string {
+	return "artwork_sales_detail"
 }
diff --git a/conf/prod/conf.ini b/conf/prod/conf.ini
index 3650b5a..b46403f 100644
--- a/conf/prod/conf.ini
+++ b/conf/prod/conf.ini
@@ -7,7 +7,7 @@ DbHost = mysql
 DbPort = 3306
 DbUser = fonchain
 DbPassWord = C250PflXIWv2SQm
-DbName = artistmgmt
+DbName = artistmgmtProd
 
 [redis]
 RedisDB = 2
diff --git a/conf/prod/dubbogo.yaml b/conf/prod/dubbogo.yaml
index c697f56..0fad28e 100644
--- a/conf/prod/dubbogo.yaml
+++ b/conf/prod/dubbogo.yaml
@@ -11,7 +11,7 @@ dubbo:
 #      address: 127.0.0.1:2181
 #      address: 121.229.45.214:9004
 #      address: 114.218.158.24:2181
-      address: 172.16.100.93:2181
+      address: zookeeper:2181
   protocols:
     triple: #triple
       name: tri