获取待付款信息增加购买方信息

docs/docs.go

@@ -6283,6 +6283,10 @@ var doc = `{
                     "description": "账户ID[报价币种]",
                     "type": "integer"
                 },
+                "accountname": {
+                    "description": "购买方名称",
+                    "type": "string"
+                },
                 "agreeunit": {
                     "description": "合约单位",
                     "type": "number"

docs/swagger.json

@@ -6267,6 +6267,10 @@
                     "description": "账户ID[报价币种]",
                     "type": "integer"
                 },
+                "accountname": {
+                    "description": "购买方名称",
+                    "type": "string"
+                },
                 "agreeunit": {
                     "description": "合约单位",
                     "type": "number"

docs/swagger.yaml

@@ -2116,6 +2116,9 @@ definitions:
       accountid:
         description: 账户ID[报价币种]
         type: integer
+      accountname:
+        description: 购买方名称
+        type: string
       agreeunit:
         description: 合约单位
         type: number

models/hsby.go

@@ -1140,6 +1140,8 @@ type HsbyBuyMyPayOrder struct {
 	Offamount      float64   `json:"offamount"  xorm:"'OFFAMOUNT'"`           // 优惠金额
 	Tradeprice     float64   `json:"tradeprice"  xorm:"'TRADEPRICE'"`         // 成交价格
 	Tradeqty       int64     `json:"tradeqty"  xorm:"'TRADEQTY'"`             // 成交数量
+
+	Accountname string `json:"accountname"  xorm:"'ACCOUNTNAME'"` // 购买方名称
 }
 
 // GetHsbyBuyMyPayOrders 获取待付款信息
@@ -1172,7 +1174,8 @@ func GetHsbyBuyMyPayOrders(accountIDs string, sellOrderID, sellAccountID int) ([
 				MARKET.TRADEMODE, 
 				ENUMDICITEM.PARAM2 CURRENCYSIGN, 
 				HS1.VENDORNAME VENDORNAME1, HS2.VENDORNAME VENDORNAME2,
-				TP.TRADEAMOUNT, TP.TRADECHARGE, TP.PAYFLAG, TP.CREATETIME, TP.PAYLIMITEDTIME, TP.OFFAMOUNT, TP.TRADEPRICE, TP.TRADEQTY`).
+				TP.TRADEAMOUNT, TP.TRADECHARGE, TP.PAYFLAG, TP.CREATETIME, TP.PAYLIMITEDTIME, TP.OFFAMOUNT, TP.TRADEPRICE, TP.TRADEQTY, 
+				U.ACCOUNTNAME`).
 		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").
@@ -1182,6 +1185,8 @@ func GetHsbyBuyMyPayOrders(accountIDs string, sellOrderID, sellAccountID int) ([
 		Join("LEFT", "HSBY_SUPPLIERINFO HS1", "HS1.VENDORID = HG1.VENDORID").
 		Join("LEFT", "HSBY_SUPPLIERINFO HS2", "HS2.VENDORID = HG2.VENDORID").
 		Join("INNER", "TRADE_PAYORDER TP", "TP.TRADEID = TRADE_TRADEDETAIL.TRADEID and TP.PAYFLAG = 1").
+		Join("LEFT", "TAACCOUNT TA", "TA.ACCOUNTID = TP.BUYACCOUNTID").
+		Join("LEFT", "USERACCOUNT U", "U.USERID = TA.RELATEDUSERID").
 		Where(`TRADE_TRADEDETAIL.BUYORSELL = 0`).
 		And(fmt.Sprintf("TRADE_TRADEDETAIL.MARKETID in (%s)", marketIDs))
 	if len(accountIDs) > 0 {