Thjpurchasetradedetail返回添加：TRANSFERPRICE

docs/docs.go

@@ -44391,7 +44391,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "tradeprice": {
-                    "description": "摘牌价格",
+                    "description": "摘牌价格 - 参考价",
                     "type": "number"
                 },
                 "tradeqty": {
@@ -44402,6 +44402,14 @@ const docTemplate = `{
                     "description": "摘牌时间",
                     "type": "string"
                 },
+                "transferprice": {
+                    "description": "转让价格 - 购买价",
+                    "type": "number"
+                },
+                "unitid": {
+                    "description": "商品单位",
+                    "type": "integer"
+                },
                 "warehouseid": {
                     "description": "仓库ID",
                     "type": "integer"

docs/swagger.json

@@ -44382,7 +44382,7 @@
                     "type": "string"
                 },
                 "tradeprice": {
-                    "description": "摘牌价格",
+                    "description": "摘牌价格 - 参考价",
                     "type": "number"
                 },
                 "tradeqty": {
@@ -44393,6 +44393,14 @@
                     "description": "摘牌时间",
                     "type": "string"
                 },
+                "transferprice": {
+                    "description": "转让价格 - 购买价",
+                    "type": "number"
+                },
+                "unitid": {
+                    "description": "商品单位",
+                    "type": "integer"
+                },
                 "warehouseid": {
                     "description": "仓库ID",
                     "type": "integer"

docs/swagger.yaml

@@ -18891,7 +18891,7 @@ definitions:
         description: 交易日(yyyyMMdd)
         type: string
       tradeprice:
-        description: 摘牌价格
+        description: 摘牌价格 - 参考价
         type: number
       tradeqty:
         description: '[预售价]摘牌数量'
@@ -18899,6 +18899,12 @@ definitions:
       tradetime:
         description: 摘牌时间
         type: string
+      transferprice:
+        description: 转让价格 - 购买价
+        type: number
+      unitid:
+        description: 商品单位
+        type: integer
       warehouseid:
         description: 仓库ID
         type: integer

models/ferroalloy.go

@@ -638,7 +638,7 @@ type Thjpurchasetradedetail struct {
 	SELLUSERID           int64     `json:"selluserid" xorm:"SELLUSERID"`                                // 卖方用户ID
 	SELLACCOUNTID        int64     `json:"sellaccountid" xorm:"SELLACCOUNTID"`                          // 卖方账号ID
 	TRADETIME            time.Time `json:"tradetime" xorm:"TRADETIME"`                                  // 摘牌时间
-	TRADEPRICE           float64   `json:"tradeprice" xorm:"TRADEPRICE"`                                // 摘牌价格
+	TRADEPRICE           float64   `json:"tradeprice" xorm:"TRADEPRICE"`                                // 摘牌价格 - 参考价
 	TRADEQTY             int64     `json:"tradeqty" xorm:"TRADEQTY"`                                    // [预售价]摘牌数量
 	TRADEAMOUNT          float64   `json:"tradeamount" xorm:"TRADEAMOUNT"`                              // 摘牌总货款
 	DEPOSITRATE          float64   `json:"depositrate" xorm:"DEPOSITRATE"`                              // 定金比例
@@ -674,9 +674,10 @@ type Thjpurchasetradedetail struct {
 	THJDELIVERYMODEDISPLAY string `json:"thjdeliverymodedisplay" xorm:"THJDELIVERYMODEDISPLAY"` // 提货方式
 	THJORDERSTATUSDISPLAY  string `json:"thjorderstatusdisplay" xorm:"THJORDERSTATUSDISPLAY"`   // 状态
 
-	ENDDATEMONTH string `json:"enddatemonth" xorm:"ENDDATEMONTH"` // 到期月份
-	ENDDATE      string `json:"enddate" xorm:"ENDDATE"`           // 到期日期
-	UNITID       int    `json:"unitid" xorm:"UNITID"`             // 商品单位
+	ENDDATEMONTH  string  `json:"enddatemonth" xorm:"ENDDATEMONTH"`   // 到期月份
+	ENDDATE       string  `json:"enddate" xorm:"ENDDATE"`             // 到期日期
+	UNITID        int32   `json:"unitid" xorm:"UNITID"`               // 商品单位
+	TRANSFERPRICE float64 `json:"transferprice" xorm:"TRANSFERPRICE"` // 转让价格 - 购买价
 
 	TYPE int `json:"-" xorm:"-" form:"type"` // 类型 - 0:未完成 1:已完成
 
@@ -738,7 +739,8 @@ func (r *Thjpurchasetradedetail) buildSql() string {
 		t.LASTPRICEDATE,
 		to_char(pi.enddate, 'yyyy-MM') ENDDATEMONTH,
         to_char(pi.enddate, 'yyyy-MM-dd') ENDDATE,
-		wr.UNITID
+		wr.UNITID,
+		t.TRANSFERPRICE
 	from THJ_PurchaseTradeDetail t
 	inner join WR_PresaleInfo pi 
 		on t.presaleapplyid = pi.presaleapplyid