/Digital/QueryDigitalTradeOrderDetails：获取数字现货交易委托表

/Digital/QueryDigitalTradeTradeDetails：获取数字现货交易成交表

controllers/digital/queryDigital.go

@@ -63,3 +63,44 @@ func QueryTaaccountDigitalLogs(c *gin.Context) {
 	a.DoBindReq(&m)
 	a.DoGetDataI(&m)
 }
+
+// QueryDigitalTradeOrderDetails
+// @Summary 获取数字现货交易委托表
+// @Produce  json
+// @accept   application/json
+// @Security ApiKeyAuth
+// @Param   userid 				query    string true 	"用户ID"
+// @Param   digitalaccountid 	query    string false 	"数字账户ID"
+// @Param   goodsid 			query    int	false 	"商品ID"
+// @Param   tradedate 			query    string false 	"交易日(yyyyMMdd)"
+// @Param   orderstatuses 		query    string false 	"委托状态(多个逗号分隔) 参考枚举orderstatus"
+// @Success 200    {array}  models.DigitaltradeOrderdetail
+// @Failure 500    {object} app.Response
+// @Router  /Digital/QueryDigitalTradeOrderDetails [post]
+// @Tags    数字现货账户
+func QueryDigitalTradeOrderDetails(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.DigitaltradeOrderdetail{}
+	a.DoBindReq(&m)
+	a.DoGetDataI(&m)
+}
+
+// QueryDigitalTradeTradeDetails
+// @Summary 获取数字现货交易成交表
+// @Produce  json
+// @accept   application/json
+// @Security ApiKeyAuth
+// @Param   userid 				query    string true 	"用户ID"
+// @Param   digitalaccountid 	query    string false 	"数字账户ID"
+// @Param   goodsid 			query    int	false 	"商品ID"
+// @Param   tradedate 			query    string false 	"交易日(yyyyMMdd)"
+// @Success 200    {array}  models.DigitaltradeTradedetail
+// @Failure 500    {object} app.Response
+// @Router  /Digital/QueryDigitalTradeTradeDetails [post]
+// @Tags    数字现货账户
+func QueryDigitalTradeTradeDetails(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.DigitaltradeTradedetail{}
+	a.DoBindReq(&m)
+	a.DoGetDataI(&m)
+}

docs/docs.go

@@ -2435,6 +2435,138 @@ const docTemplate = `{
                 }
             }
         },
+        "/Digital/QueryDigitalTradeOrderDetails": {
+            "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "数字现货账户"
+                ],
+                "summary": "获取数字现货交易委托表",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "用户ID",
+                        "name": "userid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "数字账户ID",
+                        "name": "digitalaccountid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "商品ID",
+                        "name": "goodsid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "交易日(yyyyMMdd)",
+                        "name": "tradedate",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "委托状态(多个逗号分隔) 参考枚举orderstatus",
+                        "name": "orderstatuses",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.DigitaltradeOrderdetail"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/Digital/QueryDigitalTradeTradeDetails": {
+            "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "数字现货账户"
+                ],
+                "summary": "获取数字现货交易成交表",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "用户ID",
+                        "name": "userid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "数字账户ID",
+                        "name": "digitalaccountid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "商品ID",
+                        "name": "goodsid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "交易日(yyyyMMdd)",
+                        "name": "tradedate",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.DigitaltradeTradedetail"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Digital/QueryTaaccountDigitalChangeApplys": {
             "post": {
                 "security": [
@@ -31164,6 +31296,298 @@ const docTemplate = `{
                 }
             }
         },
+        "models.DigitaltradeOrderdetail": {
+            "type": "object",
+            "required": [
+                "userid"
+            ],
+            "properties": {
+                "baseaccountid": {
+                    "description": "基础货币账户ID",
+                    "type": "string"
+                },
+                "basecurrencyid": {
+                    "description": "基础货币ID - digitalcurrency枚举",
+                    "type": "integer"
+                },
+                "buildtype": {
+                    "description": "委托单据类型 - 1:建仓 2:平仓 3:先平后建",
+                    "type": "integer"
+                },
+                "buyorsell": {
+                    "description": "方向 - 0:买 1:卖",
+                    "type": "integer"
+                },
+                "cancelorderid": {
+                    "description": "撤单单号(撤单时填写)",
+                    "type": "string"
+                },
+                "cancelvolume": {
+                    "description": "撤单数量 - 按基础货币小数位",
+                    "type": "number"
+                },
+                "clientordertime": {
+                    "description": "客户端委托时间",
+                    "type": "string"
+                },
+                "clientticket": {
+                    "description": "客户端流水号",
+                    "type": "string"
+                },
+                "clienttype": {
+                    "description": "客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端_安卓 4:网页客户端 5:微信客户端 6:手机客户端_苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)",
+                    "type": "integer"
+                },
+                "freezecharge": {
+                    "description": "冻结手续费",
+                    "type": "number"
+                },
+                "freezevalue": {
+                    "description": "冻结金额 - 按计价货币小数位(买)",
+                    "type": "number"
+                },
+                "freezevolume": {
+                    "description": "冻结数量 - 按基础货币小数位(卖)",
+                    "type": "number"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "memberuserid": {
+                    "description": "所属会员UserID",
+                    "type": "integer"
+                },
+                "operatetype": {
+                    "description": "操作类型 -枚举“orderoperatetype\" - 1:正常下单 2:斩仓 3:转单 4:结算撤单 5:系统卖出(适用于先平后建的卖出) 6:行情源报价 7:（结算)到期强平 8:（结算)协议转让 9:系统对冲单 10:（结算)到期无效 11:交割协议转让 12:交割协议平仓 13:交割成交(所有权) 14:管理端强行平仓 15:管理端协议转让 ... 23:融资买入",
+                    "type": "integer"
+                },
+                "operatorid": {
+                    "description": "登录账号(LoginID)",
+                    "type": "integer"
+                },
+                "orderid": {
+                    "description": "委托单号(600+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "string"
+                },
+                "ordermode": {
+                    "description": "委托方式 - 1:按数量 2:按成交额(市价时-先不实现)",
+                    "type": "integer"
+                },
+                "orderprice": {
+                    "description": "委托价格 - 按商品行情小数位",
+                    "type": "number"
+                },
+                "ordersrc": {
+                    "description": "委托来源 -  1:客户端 2:管理端 3:风控服务 4:交割服务 5:交易服务 6:交易日结 7:商品强平 8:管理端商品退市强平 9:交易接口 10:交割服务商被动(受托竞价) 11:预埋触发",
+                    "type": "integer"
+                },
+                "orderstatus": {
+                    "description": "委托状态 - 参考枚举''orderstatus'' - 1:委托请求  2:待冻结  3:委托成功  4:委托失败  5:配对成功  6:已撤  7:部成  8:已成  9:部成部撤  10:成交失败  11:委托拒绝  12:经过摘牌(先摘后挂专用)  13:冻结成功(通道交易专用)  14:通道已撤  15:通道部成部撤  16:成交失败违约(荷兰式竞拍专用)  17:冻结PD成功  18:冻结PD失败  19:冻结能量成功  20:冻结能量失败  21:预约已报价  22:过期未付  23:优惠券处理中  24:仓单生成失败  25:首付扣款失败  26:履约失败  27:撤单解冻贷款失败",
+                    "type": "integer"
+                },
+                "ordertime": {
+                    "description": "委托时间",
+                    "type": "string"
+                },
+                "ordervalue": {
+                    "description": "委托金额 - 按计价货币小数位",
+                    "type": "number"
+                },
+                "ordervolume": {
+                    "description": "委托数量 - 按基础货币小数位",
+                    "type": "number"
+                },
+                "preorderid": {
+                    "description": "关联预埋单号(止盈止损单时填写)",
+                    "type": "string"
+                },
+                "pricemode": {
+                    "description": "取价方式- 枚举\"Pricemode2\" - 1:市价 2: 限价",
+                    "type": "integer"
+                },
+                "quoteaccountid": {
+                    "description": "计价货币账户ID",
+                    "type": "string"
+                },
+                "quotecurrencyid": {
+                    "description": "计价货币ID - digitalcurrency枚举",
+                    "type": "integer"
+                },
+                "retcode": {
+                    "description": "错误代码",
+                    "type": "integer"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "tradeproperty": {
+                    "description": "交易属性",
+                    "type": "integer"
+                },
+                "tradevolume": {
+                    "description": "成交数量 - 按基础货币小数位",
+                    "type": "number"
+                },
+                "unfreezecharge": {
+                    "description": "解冻手续费",
+                    "type": "number"
+                },
+                "unfreezevalue": {
+                    "description": "解冻金额 - 按计价货币小数位(买)",
+                    "type": "number"
+                },
+                "unfreezevolume": {
+                    "description": "解冻数量 - 按基础货币小数位(卖)",
+                    "type": "number"
+                },
+                "updatetime": {
+                    "description": "更新时间",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                },
+                "uuid": {
+                    "description": "发起端唯一id",
+                    "type": "string"
+                },
+                "validtime": {
+                    "description": "有效期限",
+                    "type": "string"
+                },
+                "validtype": {
+                    "description": "有效类型 - 枚举\"ValidType\" - 4一直有效",
+                    "type": "integer"
+                }
+            }
+        },
+        "models.DigitaltradeTradedetail": {
+            "type": "object",
+            "required": [
+                "userid"
+            ],
+            "properties": {
+                "baseaccountid": {
+                    "description": "基础货币账户ID",
+                    "type": "string"
+                },
+                "basecurrencyid": {
+                    "description": "基础货币ID - digitalcurrency枚举",
+                    "type": "integer"
+                },
+                "buildtype": {
+                    "description": "委托单据类型 1:建仓",
+                    "type": "integer"
+                },
+                "buyorsell": {
+                    "description": "方向 - 0:买 1:卖",
+                    "type": "integer"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "matchbaseaccountid": {
+                    "description": "对手基础货币账户ID",
+                    "type": "string"
+                },
+                "matchquoteaccountid": {
+                    "description": "对手计价货币账户ID",
+                    "type": "string"
+                },
+                "matchuserid": {
+                    "description": "对手用户ID",
+                    "type": "integer"
+                },
+                "memberuserid": {
+                    "description": "所属会员UserID",
+                    "type": "integer"
+                },
+                "nfeealgorithm": {
+                    "description": "手续费收取方式  1：比率  2：固定",
+                    "type": "integer"
+                },
+                "openexchagechargevalue": {
+                    "description": "手续费设置值(平台部分)",
+                    "type": "number"
+                },
+                "openmemberchargevalue": {
+                    "description": "手续费设置值(会员部分)",
+                    "type": "number"
+                },
+                "orderid": {
+                    "description": "委托单号",
+                    "type": "string"
+                },
+                "quoteaccountid": {
+                    "description": "计价货币账户ID",
+                    "type": "string"
+                },
+                "quotecurrencyid": {
+                    "description": "计价货币ID - digitalcurrency枚举",
+                    "type": "integer"
+                },
+                "realtradevalue": {
+                    "description": "实际成交金额 - 按计价货币小数位",
+                    "type": "number"
+                },
+                "status": {
+                    "description": "处理状态 - 1:待处理 2:已处理 3:处理失败",
+                    "type": "integer"
+                },
+                "tradecharge": {
+                    "description": "手续费 - 买方按成交金额 卖方按成交数量",
+                    "type": "number"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "tradeid": {
+                    "description": "成交单号(601+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "string"
+                },
+                "tradeprice": {
+                    "description": "成交价格",
+                    "type": "number"
+                },
+                "tradeproperty": {
+                    "description": "交易属性",
+                    "type": "integer"
+                },
+                "tradetime": {
+                    "description": "成交时间",
+                    "type": "string"
+                },
+                "tradetype": {
+                    "description": "成交类别 - 枚举 tradetype(1:正常委托成交 2:定向做市成交(接单))",
+                    "type": "integer"
+                },
+                "tradevalue": {
+                    "description": "成交金额 - 按计价货币小数位",
+                    "type": "number"
+                },
+                "tradevolume": {
+                    "description": "成交数量 - 按基础货币小数位",
+                    "type": "number"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                }
+            }
+        },
         "models.Division": {
             "type": "object",
             "required": [

docs/swagger.json

@@ -2427,6 +2427,138 @@
                 }
             }
         },
+        "/Digital/QueryDigitalTradeOrderDetails": {
+            "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "数字现货账户"
+                ],
+                "summary": "获取数字现货交易委托表",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "用户ID",
+                        "name": "userid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "数字账户ID",
+                        "name": "digitalaccountid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "商品ID",
+                        "name": "goodsid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "交易日(yyyyMMdd)",
+                        "name": "tradedate",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "委托状态(多个逗号分隔) 参考枚举orderstatus",
+                        "name": "orderstatuses",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.DigitaltradeOrderdetail"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/Digital/QueryDigitalTradeTradeDetails": {
+            "post": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "数字现货账户"
+                ],
+                "summary": "获取数字现货交易成交表",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "用户ID",
+                        "name": "userid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "数字账户ID",
+                        "name": "digitalaccountid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "商品ID",
+                        "name": "goodsid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "交易日(yyyyMMdd)",
+                        "name": "tradedate",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.DigitaltradeTradedetail"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Digital/QueryTaaccountDigitalChangeApplys": {
             "post": {
                 "security": [
@@ -31156,6 +31288,298 @@
                 }
             }
         },
+        "models.DigitaltradeOrderdetail": {
+            "type": "object",
+            "required": [
+                "userid"
+            ],
+            "properties": {
+                "baseaccountid": {
+                    "description": "基础货币账户ID",
+                    "type": "string"
+                },
+                "basecurrencyid": {
+                    "description": "基础货币ID - digitalcurrency枚举",
+                    "type": "integer"
+                },
+                "buildtype": {
+                    "description": "委托单据类型 - 1:建仓 2:平仓 3:先平后建",
+                    "type": "integer"
+                },
+                "buyorsell": {
+                    "description": "方向 - 0:买 1:卖",
+                    "type": "integer"
+                },
+                "cancelorderid": {
+                    "description": "撤单单号(撤单时填写)",
+                    "type": "string"
+                },
+                "cancelvolume": {
+                    "description": "撤单数量 - 按基础货币小数位",
+                    "type": "number"
+                },
+                "clientordertime": {
+                    "description": "客户端委托时间",
+                    "type": "string"
+                },
+                "clientticket": {
+                    "description": "客户端流水号",
+                    "type": "string"
+                },
+                "clienttype": {
+                    "description": "客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端_安卓 4:网页客户端 5:微信客户端 6:手机客户端_苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)",
+                    "type": "integer"
+                },
+                "freezecharge": {
+                    "description": "冻结手续费",
+                    "type": "number"
+                },
+                "freezevalue": {
+                    "description": "冻结金额 - 按计价货币小数位(买)",
+                    "type": "number"
+                },
+                "freezevolume": {
+                    "description": "冻结数量 - 按基础货币小数位(卖)",
+                    "type": "number"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "memberuserid": {
+                    "description": "所属会员UserID",
+                    "type": "integer"
+                },
+                "operatetype": {
+                    "description": "操作类型 -枚举“orderoperatetype\" - 1:正常下单 2:斩仓 3:转单 4:结算撤单 5:系统卖出(适用于先平后建的卖出) 6:行情源报价 7:（结算)到期强平 8:（结算)协议转让 9:系统对冲单 10:（结算)到期无效 11:交割协议转让 12:交割协议平仓 13:交割成交(所有权) 14:管理端强行平仓 15:管理端协议转让 ... 23:融资买入",
+                    "type": "integer"
+                },
+                "operatorid": {
+                    "description": "登录账号(LoginID)",
+                    "type": "integer"
+                },
+                "orderid": {
+                    "description": "委托单号(600+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "string"
+                },
+                "ordermode": {
+                    "description": "委托方式 - 1:按数量 2:按成交额(市价时-先不实现)",
+                    "type": "integer"
+                },
+                "orderprice": {
+                    "description": "委托价格 - 按商品行情小数位",
+                    "type": "number"
+                },
+                "ordersrc": {
+                    "description": "委托来源 -  1:客户端 2:管理端 3:风控服务 4:交割服务 5:交易服务 6:交易日结 7:商品强平 8:管理端商品退市强平 9:交易接口 10:交割服务商被动(受托竞价) 11:预埋触发",
+                    "type": "integer"
+                },
+                "orderstatus": {
+                    "description": "委托状态 - 参考枚举''orderstatus'' - 1:委托请求  2:待冻结  3:委托成功  4:委托失败  5:配对成功  6:已撤  7:部成  8:已成  9:部成部撤  10:成交失败  11:委托拒绝  12:经过摘牌(先摘后挂专用)  13:冻结成功(通道交易专用)  14:通道已撤  15:通道部成部撤  16:成交失败违约(荷兰式竞拍专用)  17:冻结PD成功  18:冻结PD失败  19:冻结能量成功  20:冻结能量失败  21:预约已报价  22:过期未付  23:优惠券处理中  24:仓单生成失败  25:首付扣款失败  26:履约失败  27:撤单解冻贷款失败",
+                    "type": "integer"
+                },
+                "ordertime": {
+                    "description": "委托时间",
+                    "type": "string"
+                },
+                "ordervalue": {
+                    "description": "委托金额 - 按计价货币小数位",
+                    "type": "number"
+                },
+                "ordervolume": {
+                    "description": "委托数量 - 按基础货币小数位",
+                    "type": "number"
+                },
+                "preorderid": {
+                    "description": "关联预埋单号(止盈止损单时填写)",
+                    "type": "string"
+                },
+                "pricemode": {
+                    "description": "取价方式- 枚举\"Pricemode2\" - 1:市价 2: 限价",
+                    "type": "integer"
+                },
+                "quoteaccountid": {
+                    "description": "计价货币账户ID",
+                    "type": "string"
+                },
+                "quotecurrencyid": {
+                    "description": "计价货币ID - digitalcurrency枚举",
+                    "type": "integer"
+                },
+                "retcode": {
+                    "description": "错误代码",
+                    "type": "integer"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "tradeproperty": {
+                    "description": "交易属性",
+                    "type": "integer"
+                },
+                "tradevolume": {
+                    "description": "成交数量 - 按基础货币小数位",
+                    "type": "number"
+                },
+                "unfreezecharge": {
+                    "description": "解冻手续费",
+                    "type": "number"
+                },
+                "unfreezevalue": {
+                    "description": "解冻金额 - 按计价货币小数位(买)",
+                    "type": "number"
+                },
+                "unfreezevolume": {
+                    "description": "解冻数量 - 按基础货币小数位(卖)",
+                    "type": "number"
+                },
+                "updatetime": {
+                    "description": "更新时间",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                },
+                "uuid": {
+                    "description": "发起端唯一id",
+                    "type": "string"
+                },
+                "validtime": {
+                    "description": "有效期限",
+                    "type": "string"
+                },
+                "validtype": {
+                    "description": "有效类型 - 枚举\"ValidType\" - 4一直有效",
+                    "type": "integer"
+                }
+            }
+        },
+        "models.DigitaltradeTradedetail": {
+            "type": "object",
+            "required": [
+                "userid"
+            ],
+            "properties": {
+                "baseaccountid": {
+                    "description": "基础货币账户ID",
+                    "type": "string"
+                },
+                "basecurrencyid": {
+                    "description": "基础货币ID - digitalcurrency枚举",
+                    "type": "integer"
+                },
+                "buildtype": {
+                    "description": "委托单据类型 1:建仓",
+                    "type": "integer"
+                },
+                "buyorsell": {
+                    "description": "方向 - 0:买 1:卖",
+                    "type": "integer"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "matchbaseaccountid": {
+                    "description": "对手基础货币账户ID",
+                    "type": "string"
+                },
+                "matchquoteaccountid": {
+                    "description": "对手计价货币账户ID",
+                    "type": "string"
+                },
+                "matchuserid": {
+                    "description": "对手用户ID",
+                    "type": "integer"
+                },
+                "memberuserid": {
+                    "description": "所属会员UserID",
+                    "type": "integer"
+                },
+                "nfeealgorithm": {
+                    "description": "手续费收取方式  1：比率  2：固定",
+                    "type": "integer"
+                },
+                "openexchagechargevalue": {
+                    "description": "手续费设置值(平台部分)",
+                    "type": "number"
+                },
+                "openmemberchargevalue": {
+                    "description": "手续费设置值(会员部分)",
+                    "type": "number"
+                },
+                "orderid": {
+                    "description": "委托单号",
+                    "type": "string"
+                },
+                "quoteaccountid": {
+                    "description": "计价货币账户ID",
+                    "type": "string"
+                },
+                "quotecurrencyid": {
+                    "description": "计价货币ID - digitalcurrency枚举",
+                    "type": "integer"
+                },
+                "realtradevalue": {
+                    "description": "实际成交金额 - 按计价货币小数位",
+                    "type": "number"
+                },
+                "status": {
+                    "description": "处理状态 - 1:待处理 2:已处理 3:处理失败",
+                    "type": "integer"
+                },
+                "tradecharge": {
+                    "description": "手续费 - 买方按成交金额 卖方按成交数量",
+                    "type": "number"
+                },
+                "tradedate": {
+                    "description": "交易日(yyyyMMdd)",
+                    "type": "string"
+                },
+                "tradeid": {
+                    "description": "成交单号(601+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "string"
+                },
+                "tradeprice": {
+                    "description": "成交价格",
+                    "type": "number"
+                },
+                "tradeproperty": {
+                    "description": "交易属性",
+                    "type": "integer"
+                },
+                "tradetime": {
+                    "description": "成交时间",
+                    "type": "string"
+                },
+                "tradetype": {
+                    "description": "成交类别 - 枚举 tradetype(1:正常委托成交 2:定向做市成交(接单))",
+                    "type": "integer"
+                },
+                "tradevalue": {
+                    "description": "成交金额 - 按计价货币小数位",
+                    "type": "number"
+                },
+                "tradevolume": {
+                    "description": "成交数量 - 按基础货币小数位",
+                    "type": "number"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                }
+            }
+        },
         "models.Division": {
             "type": "object",
             "required": [

docs/swagger.yaml

@@ -4957,6 +4957,227 @@ definitions:
         description: 顺序
         type: integer
     type: object
+  models.DigitaltradeOrderdetail:
+    properties:
+      baseaccountid:
+        description: 基础货币账户ID
+        type: string
+      basecurrencyid:
+        description: 基础货币ID - digitalcurrency枚举
+        type: integer
+      buildtype:
+        description: 委托单据类型 - 1:建仓 2:平仓 3:先平后建
+        type: integer
+      buyorsell:
+        description: 方向 - 0:买 1:卖
+        type: integer
+      cancelorderid:
+        description: 撤单单号(撤单时填写)
+        type: string
+      cancelvolume:
+        description: 撤单数量 - 按基础货币小数位
+        type: number
+      clientordertime:
+        description: 客户端委托时间
+        type: string
+      clientticket:
+        description: 客户端流水号
+        type: string
+      clienttype:
+        description: 客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端_安卓 4:网页客户端 5:微信客户端
+          6:手机客户端_苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)
+        type: integer
+      freezecharge:
+        description: 冻结手续费
+        type: number
+      freezevalue:
+        description: 冻结金额 - 按计价货币小数位(买)
+        type: number
+      freezevolume:
+        description: 冻结数量 - 按基础货币小数位(卖)
+        type: number
+      goodsid:
+        description: 商品ID
+        type: integer
+      marketid:
+        description: 市场ID
+        type: integer
+      memberuserid:
+        description: 所属会员UserID
+        type: integer
+      operatetype:
+        description: 操作类型 -枚举“orderoperatetype" - 1:正常下单 2:斩仓 3:转单 4:结算撤单 5:系统卖出(适用于先平后建的卖出)
+          6:行情源报价 7:（结算)到期强平 8:（结算)协议转让 9:系统对冲单 10:（结算)到期无效 11:交割协议转让 12:交割协议平仓 13:交割成交(所有权)
+          14:管理端强行平仓 15:管理端协议转让 ... 23:融资买入
+        type: integer
+      operatorid:
+        description: 登录账号(LoginID)
+        type: integer
+      orderid:
+        description: 委托单号(600+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+        type: string
+      ordermode:
+        description: 委托方式 - 1:按数量 2:按成交额(市价时-先不实现)
+        type: integer
+      orderprice:
+        description: 委托价格 - 按商品行情小数位
+        type: number
+      ordersrc:
+        description: 委托来源 -  1:客户端 2:管理端 3:风控服务 4:交割服务 5:交易服务 6:交易日结 7:商品强平 8:管理端商品退市强平
+          9:交易接口 10:交割服务商被动(受托竞价) 11:预埋触发
+        type: integer
+      orderstatus:
+        description: 委托状态 - 参考枚举''orderstatus'' - 1:委托请求  2:待冻结  3:委托成功  4:委托失败  5:配对成功  6:已撤  7:部成  8:已成  9:部成部撤  10:成交失败  11:委托拒绝  12:经过摘牌(先摘后挂专用)  13:冻结成功(通道交易专用)  14:通道已撤  15:通道部成部撤  16:成交失败违约(荷兰式竞拍专用)  17:冻结PD成功  18:冻结PD失败  19:冻结能量成功  20:冻结能量失败  21:预约已报价  22:过期未付  23:优惠券处理中  24:仓单生成失败  25:首付扣款失败  26:履约失败  27:撤单解冻贷款失败
+        type: integer
+      ordertime:
+        description: 委托时间
+        type: string
+      ordervalue:
+        description: 委托金额 - 按计价货币小数位
+        type: number
+      ordervolume:
+        description: 委托数量 - 按基础货币小数位
+        type: number
+      preorderid:
+        description: 关联预埋单号(止盈止损单时填写)
+        type: string
+      pricemode:
+        description: '取价方式- 枚举"Pricemode2" - 1:市价 2: 限价'
+        type: integer
+      quoteaccountid:
+        description: 计价货币账户ID
+        type: string
+      quotecurrencyid:
+        description: 计价货币ID - digitalcurrency枚举
+        type: integer
+      retcode:
+        description: 错误代码
+        type: integer
+      tradedate:
+        description: 交易日(yyyyMMdd)
+        type: string
+      tradeproperty:
+        description: 交易属性
+        type: integer
+      tradevolume:
+        description: 成交数量 - 按基础货币小数位
+        type: number
+      unfreezecharge:
+        description: 解冻手续费
+        type: number
+      unfreezevalue:
+        description: 解冻金额 - 按计价货币小数位(买)
+        type: number
+      unfreezevolume:
+        description: 解冻数量 - 按基础货币小数位(卖)
+        type: number
+      updatetime:
+        description: 更新时间
+        type: string
+      userid:
+        description: 用户ID
+        type: integer
+      uuid:
+        description: 发起端唯一id
+        type: string
+      validtime:
+        description: 有效期限
+        type: string
+      validtype:
+        description: 有效类型 - 枚举"ValidType" - 4一直有效
+        type: integer
+    required:
+    - userid
+    type: object
+  models.DigitaltradeTradedetail:
+    properties:
+      baseaccountid:
+        description: 基础货币账户ID
+        type: string
+      basecurrencyid:
+        description: 基础货币ID - digitalcurrency枚举
+        type: integer
+      buildtype:
+        description: 委托单据类型 1:建仓
+        type: integer
+      buyorsell:
+        description: 方向 - 0:买 1:卖
+        type: integer
+      goodsid:
+        description: 商品ID
+        type: integer
+      marketid:
+        description: 市场ID
+        type: integer
+      matchbaseaccountid:
+        description: 对手基础货币账户ID
+        type: string
+      matchquoteaccountid:
+        description: 对手计价货币账户ID
+        type: string
+      matchuserid:
+        description: 对手用户ID
+        type: integer
+      memberuserid:
+        description: 所属会员UserID
+        type: integer
+      nfeealgorithm:
+        description: 手续费收取方式  1：比率  2：固定
+        type: integer
+      openexchagechargevalue:
+        description: 手续费设置值(平台部分)
+        type: number
+      openmemberchargevalue:
+        description: 手续费设置值(会员部分)
+        type: number
+      orderid:
+        description: 委托单号
+        type: string
+      quoteaccountid:
+        description: 计价货币账户ID
+        type: string
+      quotecurrencyid:
+        description: 计价货币ID - digitalcurrency枚举
+        type: integer
+      realtradevalue:
+        description: 实际成交金额 - 按计价货币小数位
+        type: number
+      status:
+        description: 处理状态 - 1:待处理 2:已处理 3:处理失败
+        type: integer
+      tradecharge:
+        description: 手续费 - 买方按成交金额 卖方按成交数量
+        type: number
+      tradedate:
+        description: 交易日(yyyyMMdd)
+        type: string
+      tradeid:
+        description: 成交单号(601+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+        type: string
+      tradeprice:
+        description: 成交价格
+        type: number
+      tradeproperty:
+        description: 交易属性
+        type: integer
+      tradetime:
+        description: 成交时间
+        type: string
+      tradetype:
+        description: 成交类别 - 枚举 tradetype(1:正常委托成交 2:定向做市成交(接单))
+        type: integer
+      tradevalue:
+        description: 成交金额 - 按计价货币小数位
+        type: number
+      tradevolume:
+        description: 成交数量 - 按基础货币小数位
+        type: number
+      userid:
+        description: 用户ID
+        type: integer
+    required:
+    - userid
+    type: object
   models.Division:
     properties:
       autoid:
@@ -34174,6 +34395,90 @@ paths:
       summary: 查询商品交割关系表
       tags:
       - 交割服务
+  /Digital/QueryDigitalTradeOrderDetails:
+    post:
+      consumes:
+      - application/json
+      parameters:
+      - description: 用户ID
+        in: query
+        name: userid
+        required: true
+        type: string
+      - description: 数字账户ID
+        in: query
+        name: digitalaccountid
+        type: string
+      - description: 商品ID
+        in: query
+        name: goodsid
+        type: integer
+      - description: 交易日(yyyyMMdd)
+        in: query
+        name: tradedate
+        type: string
+      - description: 委托状态(多个逗号分隔) 参考枚举orderstatus
+        in: query
+        name: orderstatuses
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.DigitaltradeOrderdetail'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 获取数字现货交易委托表
+      tags:
+      - 数字现货账户
+  /Digital/QueryDigitalTradeTradeDetails:
+    post:
+      consumes:
+      - application/json
+      parameters:
+      - description: 用户ID
+        in: query
+        name: userid
+        required: true
+        type: string
+      - description: 数字账户ID
+        in: query
+        name: digitalaccountid
+        type: string
+      - description: 商品ID
+        in: query
+        name: goodsid
+        type: integer
+      - description: 交易日(yyyyMMdd)
+        in: query
+        name: tradedate
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.DigitaltradeTradedetail'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 获取数字现货交易成交表
+      tags:
+      - 数字现货账户
   /Digital/QueryTaaccountDigitalChangeApplys:
     post:
       consumes:

models/taaccountdigital.go

@@ -197,3 +197,146 @@ func (r *Taaccountdigitallog) GetDataEx() (interface{}, error) {
 	}
 	return sData, err
 }
+
+// DigitaltradeOrderdetail  数字货币交易委托表
+type DigitaltradeOrderdetail struct {
+	ORDERID         string    `json:"orderid" xorm:"ORDERID"`                                // 委托单号(600+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	TRADEDATE       string    `json:"tradedate" xorm:"TRADEDATE" form:"tradedate"`           // 交易日(yyyyMMdd)
+	BUILDTYPE       uint32    `json:"buildtype" xorm:"BUILDTYPE"`                            // 委托单据类型 - 1:建仓 2:平仓 3:先平后建
+	PREORDERID      string    `json:"preorderid" xorm:"PREORDERID"`                          // 关联预埋单号(止盈止损单时填写)
+	CANCELORDERID   string    `json:"cancelorderid" xorm:"CANCELORDERID"`                    // 撤单单号(撤单时填写)
+	MARKETID        uint32    `json:"marketid" xorm:"MARKETID"`                              // 市场ID
+	GOODSID         uint32    `json:"goodsid" xorm:"GOODSID" form:"goodsid"`                 // 商品ID
+	BASECURRENCYID  uint32    `json:"basecurrencyid" xorm:"BASECURRENCYID"`                  // 基础货币ID - digitalcurrency枚举
+	QUOTECURRENCYID uint32    `json:"quotecurrencyid" xorm:"QUOTECURRENCYID"`                // 计价货币ID - digitalcurrency枚举
+	USERID          uint64    `json:"userid" xorm:"USERID" form:"userid" binding:"required"` // 用户ID
+	MEMBERUSERID    uint64    `json:"memberuserid" xorm:"MEMBERUSERID"`                      // 所属会员UserID
+	BASEACCOUNTID   string    `json:"baseaccountid" xorm:"BASEACCOUNTID"`                    // 基础货币账户ID
+	QUOTEACCOUNTID  string    `json:"quoteaccountid" xorm:"QUOTEACCOUNTID"`                  // 计价货币账户ID
+	BUYORSELL       uint32    `json:"buyorsell" xorm:"BUYORSELL"`                            // 方向 - 0:买 1:卖
+	PRICEMODE       uint32    `json:"pricemode" xorm:"PRICEMODE"`                            // 取价方式- 枚举"Pricemode2" - 1:市价 2: 限价
+	ORDERMODE       uint32    `json:"ordermode" xorm:"ORDERMODE"`                            // 委托方式 - 1:按数量 2:按成交额(市价时-先不实现)
+	ORDERPRICE      float64   `json:"orderprice" xorm:"ORDERPRICE"`                          // 委托价格 - 按商品行情小数位
+	ORDERVOLUME     float64   `json:"ordervolume" xorm:"ORDERVOLUME"`                        // 委托数量 - 按基础货币小数位
+	FREEZEVOLUME    float64   `json:"freezevolume" xorm:"FREEZEVOLUME"`                      // 冻结数量 - 按基础货币小数位(卖)
+	UNFREEZEVOLUME  float64   `json:"unfreezevolume" xorm:"UNFREEZEVOLUME"`                  // 解冻数量 - 按基础货币小数位(卖)
+	TRADEVOLUME     float64   `json:"tradevolume" xorm:"TRADEVOLUME"`                        // 成交数量 - 按基础货币小数位
+	CANCELVOLUME    float64   `json:"cancelvolume" xorm:"CANCELVOLUME"`                      // 撤单数量 - 按基础货币小数位
+	ORDERVALUE      float64   `json:"ordervalue" xorm:"ORDERVALUE"`                          // 委托金额 - 按计价货币小数位
+	FREEZEVALUE     float64   `json:"freezevalue" xorm:"FREEZEVALUE"`                        // 冻结金额 - 按计价货币小数位(买)
+	UNFREEZEVALUE   float64   `json:"unfreezevalue" xorm:"UNFREEZEVALUE"`                    // 解冻金额 - 按计价货币小数位(买)
+	FREEZECHARGE    float64   `json:"freezecharge" xorm:"FREEZECHARGE"`                      // 冻结手续费
+	UNFREEZECHARGE  float64   `json:"unfreezecharge" xorm:"UNFREEZECHARGE"`                  // 解冻手续费
+	VALIDTYPE       uint32    `json:"validtype" xorm:"VALIDTYPE"`                            // 有效类型 - 枚举"ValidType" - 4一直有效
+	VALIDTIME       time.Time `json:"validtime" xorm:"VALIDTIME"`                            // 有效期限
+	OPERATETYPE     uint32    `json:"operatetype" xorm:"OPERATETYPE"`                        // 操作类型 -枚举“orderoperatetype" - 1:正常下单 2:斩仓 3:转单 4:结算撤单 5:系统卖出(适用于先平后建的卖出) 6:行情源报价 7:（结算)到期强平 8:（结算)协议转让 9:系统对冲单 10:（结算)到期无效 11:交割协议转让 12:交割协议平仓 13:交割成交(所有权) 14:管理端强行平仓 15:管理端协议转让 ... 23:融资买入
+	ORDERTIME       time.Time `json:"ordertime" xorm:"ORDERTIME"`                            // 委托时间
+	ORDERSRC        uint32    `json:"ordersrc" xorm:"ORDERSRC"`                              // 委托来源 -  1:客户端 2:管理端 3:风控服务 4:交割服务 5:交易服务 6:交易日结 7:商品强平 8:管理端商品退市强平 9:交易接口 10:交割服务商被动(受托竞价) 11:预埋触发
+	ORDERSTATUS     uint32    `json:"orderstatus" xorm:"ORDERSTATUS"`                        // 委托状态 - 参考枚举''orderstatus'' - 1:委托请求  2:待冻结  3:委托成功  4:委托失败  5:配对成功  6:已撤  7:部成  8:已成  9:部成部撤  10:成交失败  11:委托拒绝  12:经过摘牌(先摘后挂专用)  13:冻结成功(通道交易专用)  14:通道已撤  15:通道部成部撤  16:成交失败违约(荷兰式竞拍专用)  17:冻结PD成功  18:冻结PD失败  19:冻结能量成功  20:冻结能量失败  21:预约已报价  22:过期未付  23:优惠券处理中  24:仓单生成失败  25:首付扣款失败  26:履约失败  27:撤单解冻贷款失败
+	OPERATORID      uint64    `json:"operatorid" xorm:"OPERATORID"`                          // 登录账号(LoginID)
+	UPDATETIME      time.Time `json:"updatetime" xorm:"UPDATETIME"`                          // 更新时间
+	CLIENTORDERTIME time.Time `json:"clientordertime" xorm:"CLIENTORDERTIME"`                // 客户端委托时间
+	CLIENTTICKET    string    `json:"clientticket" xorm:"CLIENTTICKET"`                      // 客户端流水号
+	UUID            string    `json:"uuid" xorm:"UUID"`                                      // 发起端唯一id
+	CLIENTTYPE      uint32    `json:"clienttype" xorm:"CLIENTTYPE"`                          // 客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端_安卓 4:网页客户端 5:微信客户端 6:手机客户端_苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)
+	RETCODE         uint64    `json:"retcode" xorm:"RETCODE"`                                // 错误代码
+	TRADEPROPERTY   uint32    `json:"tradeproperty" xorm:"TRADEPROPERTY"`                    // 交易属性
+
+	ORDERSTATUSES    string `json:"-" xorm:"-" form:"orderstatuses"`    // 委托状态(多个逗号分隔) 参考枚举orderstatus
+	DIGITALACCOUNTID string `json:"-" xorm:"-" form:"digitalaccountid"` // 数字账户ID
+}
+
+func (r *DigitaltradeOrderdetail) calc() {
+
+}
+
+func (r *DigitaltradeOrderdetail) buildSql() string {
+	var sqlId utils.SQLVal = `
+	  select t.* from digitaltrade_orderdetail t
+  	  where t.userid = %v
+	`
+	if len(strings.TrimSpace(r.DIGITALACCOUNTID)) > 0 {
+		sqlId.Join(fmt.Sprintf(" AND (t.baseaccountid = %v or t.quoteaccountid = %v)", strings.TrimSpace(r.DIGITALACCOUNTID), strings.TrimSpace(r.DIGITALACCOUNTID)))
+	}
+	sqlId.AndEx("t.goodsid", r.GOODSID, r.GOODSID > 0)
+	sqlId.AndEx("t.tradedate", r.TRADEDATE, strings.TrimSpace(r.TRADEDATE) != "")
+	if len(strings.TrimSpace(r.ORDERSTATUSES)) > 0 {
+		sqlId.Join(fmt.Sprintf(" AND t.ORDERSTATUS IN (%v)", strings.TrimSpace(r.ORDERSTATUSES)))
+	}
+	sqlId.FormatParam(r.USERID)
+	sqlId.Join(" ORDER BY t.ORDERID DESC")
+	return sqlId.String()
+}
+
+// GetDataEx 从数据库中查询数据
+func (r *DigitaltradeOrderdetail) GetDataEx() (interface{}, error) {
+	sData := make([]DigitaltradeOrderdetail, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, err
+}
+
+// DigitaltradeTradedetail  数字货币交易成交单表
+type DigitaltradeTradedetail struct {
+	TRADEID                string    `json:"tradeid" xorm:"TRADEID"`                                // 成交单号(601+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	BUYORSELL              uint32    `json:"buyorsell" xorm:"BUYORSELL"`                            // 方向 - 0:买 1:卖
+	ORDERID                string    `json:"orderid" xorm:"ORDERID"`                                // 委托单号
+	TRADEDATE              string    `json:"tradedate" xorm:"TRADEDATE" form:"tradedate"`           // 交易日(yyyyMMdd)
+	MARKETID               uint32    `json:"marketid" xorm:"MARKETID"`                              // 市场ID
+	GOODSID                uint32    `json:"goodsid" xorm:"GOODSID" form:"goodsid"`                 // 商品ID
+	BASECURRENCYID         uint32    `json:"basecurrencyid" xorm:"BASECURRENCYID"`                  // 基础货币ID - digitalcurrency枚举
+	QUOTECURRENCYID        uint32    `json:"quotecurrencyid" xorm:"QUOTECURRENCYID"`                // 计价货币ID - digitalcurrency枚举
+	USERID                 uint64    `json:"userid" xorm:"USERID" form:"userid" binding:"required"` // 用户ID
+	MEMBERUSERID           uint64    `json:"memberuserid" xorm:"MEMBERUSERID"`                      // 所属会员UserID
+	BASEACCOUNTID          string    `json:"baseaccountid" xorm:"BASEACCOUNTID"`                    // 基础货币账户ID
+	QUOTEACCOUNTID         string    `json:"quoteaccountid" xorm:"QUOTEACCOUNTID"`                  // 计价货币账户ID
+	MATCHUSERID            uint64    `json:"matchuserid" xorm:"MATCHUSERID"`                        // 对手用户ID
+	MATCHBASEACCOUNTID     string    `json:"matchbaseaccountid" xorm:"MATCHBASEACCOUNTID"`          // 对手基础货币账户ID
+	MATCHQUOTEACCOUNTID    string    `json:"matchquoteaccountid" xorm:"MATCHQUOTEACCOUNTID"`        // 对手计价货币账户ID
+	TRADEPRICE             float64   `json:"tradeprice" xorm:"TRADEPRICE"`                          // 成交价格
+	TRADEVOLUME            float64   `json:"tradevolume" xorm:"TRADEVOLUME"`                        // 成交数量 - 按基础货币小数位
+	TRADEVALUE             float64   `json:"tradevalue" xorm:"TRADEVALUE"`                          // 成交金额 - 按计价货币小数位
+	REALTRADEVALUE         float64   `json:"realtradevalue" xorm:"REALTRADEVALUE"`                  // 实际成交金额 - 按计价货币小数位
+	TRADECHARGE            float64   `json:"tradecharge" xorm:"TRADECHARGE"`                        // 手续费 - 买方按成交金额 卖方按成交数量
+	TRADETIME              time.Time `json:"tradetime" xorm:"TRADETIME"`                            // 成交时间
+	TRADETYPE              uint32    `json:"tradetype" xorm:"TRADETYPE"`                            // 成交类别 - 枚举 tradetype(1:正常委托成交 2:定向做市成交(接单))
+	BUILDTYPE              uint32    `json:"buildtype" xorm:"BUILDTYPE"`                            // 委托单据类型 1:建仓
+	STATUS                 uint32    `json:"status" xorm:"STATUS"`                                  // 处理状态 - 1:待处理 2:已处理 3:处理失败
+	NFEEALGORITHM          uint32    `json:"nfeealgorithm" xorm:"NFEEALGORITHM"`                    // 手续费收取方式  1：比率  2：固定
+	OPENEXCHAGECHARGEVALUE float64   `json:"openexchagechargevalue" xorm:"OPENEXCHAGECHARGEVALUE"`  // 手续费设置值(平台部分)
+	OPENMEMBERCHARGEVALUE  float64   `json:"openmemberchargevalue" xorm:"OPENMEMBERCHARGEVALUE"`    // 手续费设置值(会员部分)
+	TRADEPROPERTY          uint32    `json:"tradeproperty" xorm:"TRADEPROPERTY"`                    // 交易属性
+
+	DIGITALACCOUNTID string `json:"-" xorm:"-" form:"digitalaccountid"` // 数字账户ID
+}
+
+func (r *DigitaltradeTradedetail) calc() {
+
+}
+
+func (r *DigitaltradeTradedetail) buildSql() string {
+	var sqlId utils.SQLVal = `
+	  select t.* from digitaltrade_tradedetail t
+  	  where t.userid = %v
+	`
+	if len(strings.TrimSpace(r.DIGITALACCOUNTID)) > 0 {
+		sqlId.Join(fmt.Sprintf(" AND (t.baseaccountid = %v or t.quoteaccountid = %v)", strings.TrimSpace(r.DIGITALACCOUNTID), strings.TrimSpace(r.DIGITALACCOUNTID)))
+	}
+	sqlId.AndEx("t.goodsid", r.GOODSID, r.GOODSID > 0)
+	sqlId.AndEx("t.tradedate", r.TRADEDATE, strings.TrimSpace(r.TRADEDATE) != "")
+	sqlId.FormatParam(r.USERID)
+	sqlId.Join(" ORDER BY t.TRADEID DESC")
+	return sqlId.String()
+}
+
+// GetDataEx 从数据库中查询数据
+func (r *DigitaltradeTradedetail) GetDataEx() (interface{}, error) {
+	sData := make([]DigitaltradeTradedetail, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, err
+}

routers/router.go

@@ -937,6 +937,8 @@ func InitRouter() *gin.Engine {
 		digitalR.Use(token.Auth()).POST("QueryTaaccountDigitals", digital.QueryTaaccountDigitals)
 		digitalR.Use(token.Auth()).POST("QueryTaaccountDigitalChangeApplys", digital.QueryTaaccountDigitalChangeApplys)
 		digitalR.Use(token.Auth()).POST("QueryTaaccountDigitalLogs", digital.QueryTaaccountDigitalLogs)
+		digitalR.Use(token.Auth()).POST("QueryDigitalTradeOrderDetails", digital.QueryDigitalTradeOrderDetails)
+		digitalR.Use(token.Auth()).POST("QueryDigitalTradeTradeDetails", digital.QueryDigitalTradeTradeDetails)
 	}
 
 	return r