错误 #93788

docs/docs.go

@@ -14535,6 +14535,10 @@ var doc = `{
                     "description": "市场ID",
                     "type": "integer"
                 },
+                "orderamount": {
+                    "description": "委托金额",
+                    "type": "number"
+                },
                 "orderid": {
                     "description": "单号（成交单号）",
                     "type": "string"

docs/swagger.json

@@ -14519,6 +14519,10 @@
                     "description": "市场ID",
                     "type": "integer"
                 },
+                "orderamount": {
+                    "description": "委托金额",
+                    "type": "number"
+                },
                 "orderid": {
                     "description": "单号（成交单号）",
                     "type": "string"

docs/swagger.yaml

@@ -5598,6 +5598,9 @@ definitions:
       marketid:
         description: 市场ID
         type: integer
+      orderamount:
+        description: 委托金额
+        type: number
       orderid:
         description: 单号（成交单号）
         type: string

models/hsby.go

@@ -1264,6 +1264,8 @@ type HsbyBuyMyTradeDetail struct {
 
 	Vendorname1 string `json:"vendorname1"  xorm:"'VENDORNAME1'"` // 预售商品供应商名称
 	Vendorname2 string `json:"vendorname2"  xorm:"'VENDORNAME2'"` // 挂牌商品供应商名称
+
+	Orderamount float64 `json:"orderamount" xorm:"ORDERAMOUNT"` // 委托金额
 }
 
 // GetHsbyBuyMyTradeDetails 获取"我的订单 - 已完成"单据信息（一二级市场成交单，包括历史数据）
@@ -1302,7 +1304,8 @@ func GetHsbyBuyMyTradeDetails(accountIDs string) ([]HsbyBuyMyTradeDetail, error)
 				HG1.PICURLS PICURLS1, HG2.PICURLS PICURLS2, 
 				MARKET.TRADEMODE, 
 				ENUMDICITEM.PARAM2 CURRENCYSIGN, 
-				HS1.VENDORNAME VENDORNAME1, HS2.VENDORNAME VENDORNAME2`).
+				HS1.VENDORNAME VENDORNAME1, HS2.VENDORNAME VENDORNAME2, 
+				(OD.ORDERPRICE * OD.ORDERQTY * GOODS.AGREEUNIT) ORDERAMOUNT`).
 		Join("LEFT", "GOODS", "GOODS.GOODSID = TRADE_TRADEDETAIL.GOODSID").
 		Join("LEFT", "CPTRADE_PRESALEGOODSEX", "CPTRADE_PRESALEGOODSEX.GOODSID = TRADE_TRADEDETAIL.GOODSID").
 		Join("LEFT", "HSBY_GOODSEX HG1", "HG1.GOODSID = CPTRADE_PRESALEGOODSEX.RELATEDGOODSID").
@@ -1311,6 +1314,7 @@ func GetHsbyBuyMyTradeDetails(accountIDs string) ([]HsbyBuyMyTradeDetail, error)
 		Join("LEFT", "MARKET", "MARKET.MARKETID = TRADE_TRADEDETAIL.MARKETID").
 		Join("LEFT", "HSBY_SUPPLIERINFO HS1", "HS1.VENDORID = HG1.VENDORID").
 		Join("LEFT", "HSBY_SUPPLIERINFO HS2", "HS2.VENDORID = HG2.VENDORID").
+		Join("LEFT", "TRADE_ORDERDETAIL OD", "OD.ORDERID = TRADE_TRADEDETAIL.ORDERID").
 		Where(fmt.Sprintf(`TRADE_TRADEDETAIL.BUYORSELL = 0 and TRADE_TRADEDETAIL.TRADETYPE in (1,24) 
 						   and TRADE_TRADEDETAIL.ACCOUNTID in (%s)`, accountIDs)).
 		And(fmt.Sprintf("TRADE_TRADEDETAIL.MARKETID in (%s)", marketIDs)).Find(&curOrders); err != nil {
@@ -1330,7 +1334,8 @@ func GetHsbyBuyMyTradeDetails(accountIDs string) ([]HsbyBuyMyTradeDetail, error)
 				HG1.PICURLS PICURLS1, HG2.PICURLS PICURLS2, 
 				MARKET.TRADEMODE, 
 				ENUMDICITEM.PARAM2 CURRENCYSIGN, 
-				HS1.VENDORNAME VENDORNAME1, HS2.VENDORNAME VENDORNAME2`).
+				HS1.VENDORNAME VENDORNAME1, HS2.VENDORNAME VENDORNAME2, 
+				(OD.ORDERPRICE * OD.ORDERQTY * GOODS.AGREEUNIT) ORDERAMOUNT`).
 		Join("LEFT", "GOODS", "GOODS.GOODSID = HIS_TRADE_TRADEDETAIL.GOODSID").
 		Join("LEFT", "CPTRADE_PRESALEGOODSEX", "CPTRADE_PRESALEGOODSEX.GOODSID = HIS_TRADE_TRADEDETAIL.GOODSID").
 		Join("LEFT", "HSBY_GOODSEX HG1", "HG1.GOODSID = CPTRADE_PRESALEGOODSEX.RELATEDGOODSID").
@@ -1339,6 +1344,7 @@ func GetHsbyBuyMyTradeDetails(accountIDs string) ([]HsbyBuyMyTradeDetail, error)
 		Join("LEFT", "MARKET", "MARKET.MARKETID = HIS_TRADE_TRADEDETAIL.MARKETID").
 		Join("LEFT", "HSBY_SUPPLIERINFO HS1", "HS1.VENDORID = HG1.VENDORID").
 		Join("LEFT", "HSBY_SUPPLIERINFO HS2", "HS2.VENDORID = HG2.VENDORID").
+		Join("LEFT", "HIS_TRADE_ORDERDETAIL OD", "OD.ORDERID = HIS_TRADE_TRADEDETAIL.ORDERID").
 		Where(fmt.Sprintf(`HIS_TRADE_TRADEDETAIL.BUYORSELL = 0 and HIS_TRADE_TRADEDETAIL.TRADETYPE in (1,24) and HIS_TRADE_TRADEDETAIL.ISVALIDDATA = 1 
 						   and HIS_TRADE_TRADEDETAIL.ACCOUNTID in (%s)`, accountIDs)).
 		And(fmt.Sprintf("HIS_TRADE_TRADEDETAIL.MARKETID in (%s)", marketIDs)).Find(&hisOrders); err != nil {