“获取采购商品详情”接口增加“现货商品单位ID”出参

docs/docs.go

@@ -40227,6 +40227,10 @@ const docTemplate = `{
                     "description": "现货价格",
                     "type": "number"
                 },
+                "unitid": {
+                    "description": "现货商品单位ID",
+                    "type": "integer"
+                },
                 "wrstandardcode": {
                     "description": "现货商品代码",
                     "type": "string"
@@ -40605,7 +40609,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "lastprice": {
-                    "description": "到期价格",
+                    "description": "[实际价]到期价格",
                     "type": "number"
                 },
                 "lastpricedate": {
@@ -40621,7 +40625,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "payeddeposit": {
-                    "description": "买方已付定金",
+                    "description": "[定金]买方已付定金",
                     "type": "number"
                 },
                 "payedtradedate": {
@@ -40637,7 +40641,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "remainamount": {
-                    "description": "剩余货款 = 到期总货款 - 已付定金 - 优惠金额",
+                    "description": "[尾款]剩余货款 = 到期总货款 - 已付定金 - 优惠金额",
                     "type": "number"
                 },
                 "sellaccountid": {
@@ -40693,7 +40697,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "摘牌数量",
+                    "description": "[预售价]摘牌数量",
                     "type": "integer"
                 },
                 "tradetime": {

docs/swagger.json

@@ -40218,6 +40218,10 @@
                     "description": "现货价格",
                     "type": "number"
                 },
+                "unitid": {
+                    "description": "现货商品单位ID",
+                    "type": "integer"
+                },
                 "wrstandardcode": {
                     "description": "现货商品代码",
                     "type": "string"
@@ -40596,7 +40600,7 @@
                     "type": "number"
                 },
                 "lastprice": {
-                    "description": "到期价格",
+                    "description": "[实际价]到期价格",
                     "type": "number"
                 },
                 "lastpricedate": {
@@ -40612,7 +40616,7 @@
                     "type": "integer"
                 },
                 "payeddeposit": {
-                    "description": "买方已付定金",
+                    "description": "[定金]买方已付定金",
                     "type": "number"
                 },
                 "payedtradedate": {
@@ -40628,7 +40632,7 @@
                     "type": "string"
                 },
                 "remainamount": {
-                    "description": "剩余货款 = 到期总货款 - 已付定金 - 优惠金额",
+                    "description": "[尾款]剩余货款 = 到期总货款 - 已付定金 - 优惠金额",
                     "type": "number"
                 },
                 "sellaccountid": {
@@ -40684,7 +40688,7 @@
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "摘牌数量",
+                    "description": "[预售价]摘牌数量",
                     "type": "integer"
                 },
                 "tradetime": {

docs/swagger.yaml

@@ -16894,6 +16894,9 @@ definitions:
       spotgoodsprice:
         description: 现货价格
         type: number
+      unitid:
+        description: 现货商品单位ID
+        type: integer
       wrstandardcode:
         description: 现货商品代码
         type: string
@@ -17199,7 +17202,7 @@ definitions:
         description: 到期总货款 = 到期价格 * 摘牌数量
         type: number
       lastprice:
-        description: 到期价格
+        description: '[实际价]到期价格'
         type: number
       lastpricedate:
         description: 到期价格日期 - 暂不使用
@@ -17212,7 +17215,7 @@ definitions:
           (枚举：THJOrderStatus)
         type: integer
       payeddeposit:
-        description: 买方已付定金
+        description: '[定金]买方已付定金'
         type: number
       payedtradedate:
         description: 支付尾款成功交易日
@@ -17224,7 +17227,7 @@ definitions:
         description: 发票信息
         type: string
       remainamount:
-        description: 剩余货款 = 到期总货款 - 已付定金 - 优惠金额
+        description: '[尾款]剩余货款 = 到期总货款 - 已付定金 - 优惠金额'
         type: number
       sellaccountid:
         description: 卖方账号ID
@@ -17266,7 +17269,7 @@ definitions:
         description: 摘牌价格
         type: number
       tradeqty:
-        description: 摘牌数量
+        description: '[预售价]摘牌数量'
         type: integer
       tradetime:
         description: 摘牌时间

models/ferroalloy.go

@@ -448,7 +448,7 @@ type THJWrstandardDetail_GoodsInfo struct {
 	WRSTANDARDCODE    string    `json:"wrstandardcode" xorm:"WRSTANDARDCODE"` // 现货商品代码
 	WRSTANDARDNAME    string    `json:"wrstandardname" xorm:"WRSTANDARDNAME"` // 现货商品名称
 	DELIVERYGOODSID   int32     `json:"-" xorm:"DELIVERYGOODSID"`             // 现货品种ID
-	UNITID            int32     `json:"-" xorm:"UNITID"`                      // 现货商品单位ID
+	UNITID            int32     `json:"unitid" xorm:"UNITID"`                 // 现货商品单位ID
 	MINIVALUE         int64     `json:"-" xorm:"MINIVALUE"`                   // 最小变动值
 	MINIVALUEDP       int64     `json:"-" xorm:"MINIVALUEDP"`                 // 最小变动值小数位
 	REALMINIVALUE     int64     `json:"-" xorm:"REALMINIVALUE"`               // 实际最小变动值
@@ -532,6 +532,7 @@ func (r *THJWrstandardDetailReq) GetTHJWrstandardDetail() (rsp *THJWrstandardDet
 			t.WRSTANDARDCODE,
 			t.WRSTANDARDNAME,
 			t.PICTUREURLS,
+			t.UNITID,
 			p.SPOTGOODSPRICE
 		from wrstandard t
 		left join ERMCP_SpotGoodsPrice p on t.WRSTANDARDID = p.WRSTANDARDID and p.spotgoodsbrandid=0 and p.currencyid = 1 
@@ -635,22 +636,22 @@ type Thjpurchasetradedetail struct {
 	SELLACCOUNTID        int64     `json:"sellaccountid" xorm:"SELLACCOUNTID"`                          // 卖方账号ID
 	TRADETIME            time.Time `json:"tradetime" xorm:"TRADETIME"`                                  // 摘牌时间
 	TRADEPRICE           float64   `json:"tradeprice" xorm:"TRADEPRICE"`                                // 摘牌价格
-	TRADEQTY             int64     `json:"tradeqty" xorm:"TRADEQTY"`                                    // 摘牌数量
+	TRADEQTY             int64     `json:"tradeqty" xorm:"TRADEQTY"`                                    // [预售价]摘牌数量
 	TRADEAMOUNT          float64   `json:"tradeamount" xorm:"TRADEAMOUNT"`                              // 摘牌总货款
 	DEPOSITRATE          float64   `json:"depositrate" xorm:"DEPOSITRATE"`                              // 定金比例
 	DISCOUNTAMOUNT       float64   `json:"discountamount" xorm:"DISCOUNTAMOUNT"`                        // 优惠总金额(优惠金额*TradeQty)
-	PAYEDDEPOSIT         float64   `json:"payeddeposit" xorm:"PAYEDDEPOSIT"`                            // 买方已付定金
+	PAYEDDEPOSIT         float64   `json:"payeddeposit" xorm:"PAYEDDEPOSIT"`                            // [定金]买方已付定金
 	THJDELIVERYMODE      int32     `json:"thjdeliverymode" xorm:"THJDELIVERYMODE"`                      // 交割方式 - 1：平台仓储 2：自提 3：代办运输 (枚举：THJDeliveryMode)
 	CONTACTNAME          string    `json:"contactname" xorm:"CONTACTNAME"`                              // 联系人姓名
 	CONTACTINFO          string    `json:"contactinfo" xorm:"CONTACTINFO"`                              // 联系方式
 	DESADDRESS           string    `json:"desaddress" xorm:"DESADDRESS"`                                // 目的地地址
 	RECEIPTINFO          string    `json:"receiptinfo" xorm:"RECEIPTINFO"`                              // 发票信息
 	ORDERSTATUS          int32     `json:"orderstatus" xorm:"ORDERSTATUS"`                              // 单据状态 - 1:待付尾款 2:支付尾款成功 3:支付尾款失败 4:已违约 5:卖方已确认 6:买方已确认 7:系统自动确认 (枚举：THJOrderStatus)
-	LASTPRICE            float64   `json:"lastprice" xorm:"LASTPRICE"`                                  // 到期价格
+	LASTPRICE            float64   `json:"lastprice" xorm:"LASTPRICE"`                                  // [实际价]到期价格
 	LASTAMOUNT           float64   `json:"lastamount" xorm:"LASTAMOUNT"`                                // 到期总货款 = 到期价格 * 摘牌数量
 	BUYCHARGEVALUE       float64   `json:"buychargevalue" xorm:"BUYCHARGEVALUE"`                        // 买方到期手续费
 	SELLCHARGEVALUE      float64   `json:"sellchargevalue" xorm:"SELLCHARGEVALUE"`                      // 卖方到期手续费
-	REMAINAMOUNT         float64   `json:"remainamount" xorm:"REMAINAMOUNT"`                            // 剩余货款 = 到期总货款 - 已付定金 - 优惠金额
+	REMAINAMOUNT         float64   `json:"remainamount" xorm:"REMAINAMOUNT"`                            // [尾款]剩余货款 = 到期总货款 - 已付定金 - 优惠金额
 	SELLCONFIRMREMARK    string    `json:"sellconfirmremark" xorm:"SELLCONFIRMREMARK"`                  // 卖方确认备注
 	SELLCONFIRMATTACH    string    `json:"sellconfirmattach" xorm:"SELLCONFIRMATTACH"`                  // 卖方确认附件
 	SELLCONFIRMTIME      time.Time `json:"sellconfirmtime" xorm:"SELLCONFIRMTIME"`                      // 卖方确认时间