查询持仓明细接口（/Order/QueryTradeHolderDetail）增加出参

controllers/guangzuan/tradeService.go

@@ -18,8 +18,8 @@ import (
 // @Security Group
 // @Param    userid   query    int    true  "用户ID"
 // @Param    executestatus query    int false "执行状态 - 1:未生效 2:进行中 3:已结束"
-// @Param    page          query    int false "页码"
-// @Param    pagesize      query    int false "每页条数"
+// @Param    page     query    int    false "页码"
+// @Param    pagesize query    int    false "每页条数"
 // @Success  200           {array}  models.GzcjjcorderM
 // @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrder [get]
@@ -39,8 +39,8 @@ func QueryGZCJJCOrder(c *gin.Context) {
 // @Security Group
 // @Param    userid        query    int true  "用户ID"
 // @Param    orderid  query    string false "单据ID"
-// @Param    page     query    int    false "页码"
-// @Param    pagesize query    int    false "每页条数"
+// @Param    page          query    int false "页码"
+// @Param    pagesize      query    int false "每页条数"
 // @Success  200      {array}  models.GzcjjcorderdetailM
 // @Failure  500           {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrderDetail [get]

docs/docs.go

@@ -56996,6 +56996,10 @@ const docTemplate = `{
                     "description": "释放持仓授信金额",
                     "type": "number"
                 },
+                "tacurrencyid": {
+                    "description": "报价货币ID - taaccount",
+                    "type": "integer"
+                },
                 "taname": {
                     "description": "资金账号名称",
                     "type": "string"

docs/swagger.json

@@ -56987,6 +56987,10 @@
                     "description": "释放持仓授信金额",
                     "type": "number"
                 },
+                "tacurrencyid": {
+                    "description": "报价货币ID - taaccount",
+                    "type": "integer"
+                },
                 "taname": {
                     "description": "资金账号名称",
                     "type": "string"

docs/swagger.yaml

@@ -24787,6 +24787,9 @@ definitions:
       releaseholdercredit:
         description: 释放持仓授信金额
         type: number
+      tacurrencyid:
+        description: 报价货币ID - taaccount
+        type: integer
       taname:
         description: 资金账号名称
         type: string

models/tradexx.go

@@ -33,9 +33,10 @@ type TradeGoodsEx struct {
 
 // TradeAccountEx 交易账户相关字段
 type TradeAccountEx struct {
-	TANAME   string `json:"taname"  xorm:"'TANAME'"`               // 资金账号名称
-	USERID   int64  `json:"userid"  xorm:"'USERID'" form:"userid"` // 用户id
-	USERNAME string `json:"username"  xorm:"'USERNAME'"`           // 用户名称
+	TANAME       string `json:"taname"  xorm:"'TANAME'"`               // 资金账号名称
+	USERID       int64  `json:"userid"  xorm:"'USERID'" form:"userid"` // 用户id
+	USERNAME     string `json:"username"  xorm:"'USERNAME'"`           // 用户名称
+	TaCurrencyid int64  `json:"tacurrencyid"  xorm:"'TACURRENCYID'"`   // 报价货币ID - taaccount
 }
 
 // TradePosition 持仓汇总
@@ -256,7 +257,8 @@ utmp as
  (select ta.accountid,
          ta.accountname taname,
          u.userid,
-         u.accountname  username
+         u.accountname  username,
+		 TA.CURRENCYID TACURRENCYID
     from taaccount ta
     left join useraccount u
       on ta.relateduserid = u.userid)