增加分页查询功能；修改单号长度引起的问题

config/config.xml

@@ -16,12 +16,12 @@
         <DbAddress value="192.168.31.117"/>
         <DbName    value="orcl"/>
         <DbPort    value="1521"/>
-        <DbUser    value="mtp2_test181"/>
+        <DbUser    value="mtp2_test82"/>
         <DbPwd     value="muchinfo"/>
     </DbSetting>
 
     <RedisSetting>
-        <Address   value="192.168.31.181"/>
+        <Address   value="192.168.30.182"/>
         <Port      value="5007"/>
         <Timeout   value="3"/>
         <ConnNum   value="1"/>

controllers/order/order.go

@@ -186,13 +186,12 @@ type QueryTradeOrderDetailReq struct {
 
 // QueryTradeOrderDetailRsp 委托单查询返回模型（合约市场）
 type QueryTradeOrderDetailRsp struct {
-	// 委托单字段
-	Orderid             int64     `json:"orderid"  xorm:"'ORDERID'" binding:"required"`         // 委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	Orderid             string    `json:"orderid"  xorm:"'ORDERID'"`                            // 委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
 	Tradedate           string    `json:"tradedate"  xorm:"'TRADEDATE'" binding:"required"`     // 交易日(yyyyMMdd)
 	Buildtype           int64     `json:"buildtype"  xorm:"'BUILDTYPE'" binding:"required"`     // 委托单据类型 - 1:建仓 2:平仓 3:先平后建
-	Preorderid          int64     `json:"preorderid"  xorm:"'PREORDERID'"`                      // 关联预埋单号(止盈止损单时填写)
-	Cancelorderid       int64     `json:"cancelorderid"  xorm:"'CANCELORDERID'"`                // 撤单单号(撤单时填写)
-	Relatedid           int64     `json:"relatedid"  xorm:"'RELATEDID'"`                        // 关联单号(交割单)
+	Preorderid          string    `json:"preorderid"  xorm:"'PREORDERID'"`                      // 关联预埋单号(止盈止损单时填写)
+	Cancelorderid       string    `json:"cancelorderid"  xorm:"'CANCELORDERID'"`                // 撤单单号(撤单时填写)
+	Relatedid           string    `json:"relatedid"  xorm:"'RELATEDID'"`                        // 关联单号(交割单)
 	Marketid            int64     `json:"marketid"  xorm:"'MARKETID'" binding:"required"`       // 市场ID
 	Goodsid             int64     `json:"goodsid"  xorm:"'GOODSID'" binding:"required"`         // 商品ID
 	Accountid           int64     `json:"accountid"  xorm:"'ACCOUNTID'" binding:"required"`     // 账户ID[报价币种]
@@ -225,12 +224,12 @@ type QueryTradeOrderDetailRsp struct {
 	Ordersrc            int64     `json:"ordersrc"  xorm:"'ORDERSRC'"`                          // 委托来源 -  1:客户端 2:管理端 3:风控服务 4:交割服务 5:交易服务 6:交易日结 7:商品强平 8:管理端商品退市强平 9:交易接口 10:交割服务商被动(受托竞价) 11:预埋触发
 	Clienttype          int64     `json:"clienttype"  xorm:"'CLIENTTYPE'"`                      // 客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端_安卓 4:网页客户端 5:微信客户端 6:手机客户端_苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)
 	Operatorid          int64     `json:"operatorid"  xorm:"'OPERATORID'"`                      // 登录账号(LoginID)
-	// 关联字段
+
 	GoodsCode  string `json:"goodscode" xorm:"GOODSCODE"`      // 商品代码
 	GoodsName  string `json:"goodsname" xorm:"GOODSNAME"`      // 商品名称
 	Marketname string `json:"marketname"  xorm:"'MARKETNAME'"` // 市场名称
 	TradeMode  uint32 `json:"trademode"  xorm:"'TRADEMODE'"`   // 交易模式
-	// 计算字段
+
 	Enableqty int64 `json:"enableqty" xorm:"ENABLEQTY"` // 可用数量 = 委托数量 - 成交数量 - 撤单数量
 }
 
@@ -260,10 +259,12 @@ func QueryTradeOrderDetail(c *gin.Context) {
 
 	datas := make([]QueryTradeOrderDetailRsp, 0)
 	engine := db.GetEngine()
+	// 由于uint64类型数据（单号）过长是获取会有问题（可能是oci8组件问题），所以这里将可能会出问题的单号都用to_char来输出
 	s := engine.Table("TRADE_ORDERDETAIL").
 		Join("LEFT", "GOODS", "GOODS.GOODSID = TRADE_ORDERDETAIL.GOODSID").
 		Join("LEFT", "MARKET", "MARKET.MARKETID = TRADE_ORDERDETAIL.MARKETID").
-		Select(`TRADE_ORDERDETAIL.*, TRADE_ORDERDETAIL.ORDERPRICE - TRADE_ORDERDETAIL.TRADEQTY - TRADE_ORDERDETAIL.CANCELQTY as ENABLEQTY, 
+		Select(`to_char(TRADE_ORDERDETAIL.ORDERID) as ORDERID, to_char(TRADE_ORDERDETAIL.PREORDERID) as PREORDERID, to_char(TRADE_ORDERDETAIL.CANCELORDERID) as CANCELORDERID,
+				TRADE_ORDERDETAIL.*, TRADE_ORDERDETAIL.ORDERPRICE - TRADE_ORDERDETAIL.TRADEQTY - TRADE_ORDERDETAIL.CANCELQTY as ENABLEQTY, 
 				GOODS.GOODSCODE, GOODS.GOODSNAME, MARKET.MARKETNAME, MARKET.TRADEMODE`).
 		Where(fmt.Sprintf(`TRADE_ORDERDETAIL.ORDERSRC != 10 and TRADE_ORDERDETAIL.ACCOUNTID in (%s)`, req.AccountID)).
 		Desc("TRADE_ORDERDETAIL.ORDERTIME")
@@ -300,14 +301,14 @@ type QueryTradeDetailReq struct {
 
 // QueryTradeDetailRsp 成交单查询返回模型
 type QueryTradeDetailRsp struct {
-	// 成交单字段
 	models.Tradetradedetail `xorm:"extends"`
-	// 关联字段
-	GoodsCode  string `json:"goodscode" xorm:"GOODSCODE"`      // 商品代码
-	GoodsName  string `json:"goodsname" xorm:"GOODSNAME"`      // 商品名称
-	Marketname string `json:"marketname"  xorm:"'MARKETNAME'"` // 市场名称
-	TradeMode  uint32 `json:"trademode"  xorm:"'TRADEMODE'"`   // 交易模式
-	// 计算字段
+
+	GoodsCode         string `json:"goodscode" xorm:"GOODSCODE"`                    // 商品代码
+	GoodsName         string `json:"goodsname" xorm:"GOODSNAME"`                    // 商品名称
+	Marketname        string `json:"marketname"  xorm:"'MARKETNAME'"`               // 市场名称
+	TradeMode         uint32 `json:"trademode"  xorm:"'TRADEMODE'"`                 // 交易模式
+	ListingSelectType uint32 `json:"listingselecttype"  xorm:"'LISTINGSELECTTYPE'"` // 关联委托单挂牌点选类型 - 1:挂牌 2:摘牌 3:先摘后挂
+
 	Charge float64 `json:"charge" xorm:"CHARGE"` // 手续费
 }
 
@@ -342,8 +343,11 @@ func QueryTradeDetail(c *gin.Context) {
 	s := engine.Table("TRADE_TRADEDETAIL").
 		Join("LEFT", "GOODS", "GOODS.GOODSID = TRADE_TRADEDETAIL.GOODSID").
 		Join("LEFT", "MARKET", "MARKET.MARKETID = TRADE_TRADEDETAIL.MARKETID").
-		Select(`TRADE_TRADEDETAIL.*, CASE TRADE_TRADEDETAIL.BUILDTYPE WHEN 1 THEN TRADE_TRADEDETAIL.OPENCHARGE ELSE TRADE_TRADEDETAIL.CLOSECHARGE END as CHARGE,
-				GOODS.GOODSCODE, GOODS.GOODSNAME, MARKET.MARKETNAME, MARKET.TRADEMODE`).
+		Join("LEFT", "TRADE_ORDERDETAIL", "TRADE_ORDERDETAIL.ORDERID = TRADE_TRADEDETAIL.ORDERID").
+		Select(`to_char(TRADE_TRADEDETAIL.TRADEID) as TRADEID, to_char(TRADE_TRADEDETAIL.ORDERID) as ORDERID, 
+				TRADE_TRADEDETAIL.*, CASE TRADE_TRADEDETAIL.BUILDTYPE WHEN 1 THEN TRADE_TRADEDETAIL.OPENCHARGE ELSE TRADE_TRADEDETAIL.CLOSECHARGE END as CHARGE,
+				GOODS.GOODSCODE, GOODS.GOODSNAME, MARKET.MARKETNAME, MARKET.TRADEMODE, 
+				TRADE_ORDERDETAIL.LISTINGSELECTTYPE`).
 		Where(fmt.Sprintf("TRADE_TRADEDETAIL.ACCOUNTID in (%s)", req.AccountID)).
 		Desc("TRADE_TRADEDETAIL.TRADETIME")
 	if req.TradeID > 0 {

controllers/szdz/szdz.go

@@ -8,6 +8,7 @@ import (
 	"mtp2_if/logger"
 	"mtp2_if/models"
 	"net/http"
+	"sort"
 
 	"github.com/gin-gonic/gin"
 )
@@ -18,6 +19,7 @@ type QueryRecieptOrderReq struct {
 	GoodsID     int    `form:"goodsID" binding:"required"` // 商品ID，必填
 	AccountName string `form:"accountName"`                // 所属账户名称
 	MarketID    int    `form:"marketID"`                   // 市场ID
+	BuyOrSell   int    `form:"buyorsell"`                  // 方向
 }
 
 // QueryRecieptOrderRsp 点选挂牌委托单据查询返回模型
@@ -26,7 +28,7 @@ type QueryRecieptOrderRsp struct {
 	Goodscode   string  `json:"goodscode"  xorm:"'GOODSCODE'"`   // 商品代码
 	Goodsname   string  `json:"goodsname"  xorm:"'GOODSNAME'"`   // 商品名称
 	Buyorsell   uint32  `json:"buyorsell"  xorm:"'BUYORSELL'"`   // 方向 - 0:买 1:卖
-	Orderid     uint64  `json:"orderid"  xorm:"'ORDERID'"`       // 委托单号
+	Orderid     string  `json:"orderid"  xorm:"'ORDERID'"`       // 委托单号
 	Tradedate   string  `json:"tradedate"  xorm:"'TRADEDATE'"`   // 交易日(yyyyMMdd)
 	Orderprice  float64 `json:"orderprice"  xorm:"'ORDERPRICE'"` // 委托价格
 	EnableQty   int64   `json:"enableqty" xorm:"ENABLEQTY"`      // 可摘数量
@@ -35,13 +37,15 @@ type QueryRecieptOrderRsp struct {
 
 // QueryRecieptOrder 点选挂牌委托单据查询（摘牌大厅）
 // @Summary 点选挂牌委托单据查询（摘牌大厅）
+// @Description 说明：pagesize参数赋值不为0时表示需要分页；page参数从0开始计算
 // @Produce json
 // @Security ApiKeyAuth
 // @Param page query int false "页码"
-// @Param size query int false "每页条数"
+// @Param pagesize query int false "每页条数"
 // @Param goodsID query int true "商品ID"
 // @Param accountName query string false "所属账户名称"
 // @Param marketID query int false "市场ID"
+// @Param buyorsell query int false "方向 - 0:买 1:卖"
 // @Success 200 {object} QueryRecieptOrderRsp
 // @Failure 500 {object} app.Response
 // @Router /SZDZ/QueryRecieptOrder [get]
@@ -51,6 +55,7 @@ func QueryRecieptOrder(c *gin.Context) {
 
 	// 获取请求参数
 	var req QueryRecieptOrderReq
+	req.BuyOrSell = -1 // 买方向值为0，所以要初始赋值
 	if err := appG.C.ShouldBindQuery(&req); err != nil {
 		logger.GetLogger().Errorf("QueryRecieptOrder failed: %s", err.Error())
 		appG.Response(http.StatusBadRequest, e.INVALID_PARAMS, nil)
@@ -66,7 +71,7 @@ func QueryRecieptOrder(c *gin.Context) {
 		Join("LEFT", "TAACCOUNT", "TAACCOUNT.ACCOUNTID = TRADE_ORDERDETAIL.ACCOUNTID").
 		Join("LEFT", "USERACCOUNT", "USERACCOUNT.USERID = TAACCOUNT.RELATEDUSERID").
 		Select(`GOODS.GOODSID, GOODS.GOODSCODE, GOODS.GOODSNAME, 
-				TRADE_ORDERDETAIL.BUYORSELL, TRADE_ORDERDETAIL.ORDERID, TRADE_ORDERDETAIL.TRADEDATE, TRADE_ORDERDETAIL.ORDERPRICE, 
+				TRADE_ORDERDETAIL.BUYORSELL, to_char(TRADE_ORDERDETAIL.ORDERID) as ORDERID, TRADE_ORDERDETAIL.TRADEDATE, TRADE_ORDERDETAIL.ORDERPRICE, 
 				TRADE_ORDERDETAIL.ORDERQTY - TRADE_ORDERDETAIL.TRADEQTY - TRADE_ORDERDETAIL.CANCELQTY as ENABLEQTY, 
 				substr(USERACCOUNT.ACCOUNTNAME,0,1)||'****' as ACCOUNTNAME`).
 		Where("TRADE_ORDERDETAIL.ORDERSTATUS in (3,7,12) and GOODS.GOODSID = ?", req.GoodsID)
@@ -76,10 +81,14 @@ func QueryRecieptOrder(c *gin.Context) {
 	if req.MarketID > 0 {
 		s = s.And("TRADE_ORDERDETAIL.MARKETID = ?", req.MarketID)
 	}
-	// 判断是否要分页
-	if req.Size > 0 {
-		s = s.Limit(req.Size, req.Page*req.Size)
+	if req.BuyOrSell > -1 {
+		s = s.And("TRADE_ORDERDETAIL.BUYORSELL = ?", req.BuyOrSell)
 	}
+	// 判断是否要分页
+	// 这样分页会报错
+	// if req.Size > 0 {
+	// 	s = s.Limit(req.Size, req.Page*req.Size)
+	// }
 	d1 := make([]QueryRecieptOrderRsp, 0)
 	if err := s.Find(&d1); err != nil {
 		// 查询失败
@@ -95,7 +104,7 @@ func QueryRecieptOrder(c *gin.Context) {
 		Join("INNER", "QUOTER", "QUOTER.QUOTERID = TRADE_QUOTEDETAILNEW.QUOTERID").
 		Join("INNER", "AREAROLE", "AREAROLE.USERID = QUOTER.DEFAULTMAKERID and AREAROLE.ROLETYPE = 8").
 		Select(`GOODS.GOODSID, GOODS.GOODSCODE, GOODS.GOODSNAME, 
-				TRADE_QUOTEDETAILNEW.BUYORSELL, TRADE_QUOTEDETAILNEW.ORDERID, TRADE_QUOTEDETAILNEW.TRADEDATE, TRADE_QUOTEDETAILNEW.PRICE as ORDERPRICE, 
+				TRADE_QUOTEDETAILNEW.BUYORSELL, to_char(TRADE_QUOTEDETAILNEW.ORDERID) as ORDERID, TRADE_QUOTEDETAILNEW.TRADEDATE, TRADE_QUOTEDETAILNEW.PRICE as ORDERPRICE, 
 				TRADE_QUOTEDETAILNEW.CURQTY as ENABLEQTY, 
 				substr(QUOTER.QUOTERNAME,0,1)||'****' as ACCOUNTNAME`).
 		Where("(TRADE_QUOTEDETAILNEW.CURQTY > 0 or TRADE_QUOTEDETAILNEW.PRICE > 0) and TRADE_QUOTEDETAILNEW.ISVALID != 1 and TRADE_QUOTEDETAILNEW.FREEZESTATUS != 3")
@@ -108,11 +117,35 @@ func QueryRecieptOrder(c *gin.Context) {
 	}
 	datas = append(datas, d2...)
 
+	total := len(datas)
 	// FIXME: - 排序 & 分页
+	// 排序
+	sort.Slice(datas, func(i int, j int) bool {
+		return datas[i].Tradedate > datas[j].Tradedate
+	})
+	// 分页
+	if req.PageSize > 0 {
+		// 开始上标
+		start := req.Page * req.PageSize
+		// 结束下标
+		end := start + req.PageSize
+
+		if start <= len(datas) && end <= len(datas) {
+			datas = datas[start:end]
+		} else {
+			datas = make([]QueryRecieptOrderRsp, 0)
+		}
+	}
 
 	// 查询成功返回
 	logger.GetLogger().Infof("QueryRecieptOrder successed: %v", datas)
-	appG.Response(http.StatusOK, e.SUCCESS, datas)
+	if req.PageSize > 0 {
+		// 分页
+		appG.ResponseByPage(http.StatusOK, e.SUCCESS, datas, app.PageInfo{Page: req.Page, PageSize: req.PageSize, Total: total})
+	} else {
+		// 不分页
+		appG.Response(http.StatusOK, e.SUCCESS, datas)
+	}
 }
 
 // QueryGoodsPickupReq 商品提货单查询请求参数

docs/docs.go

@@ -889,6 +889,7 @@ var doc = `{
                         "ApiKeyAuth": []
                     }
                 ],
+                "description": "说明：pagesize参数赋值不为0时表示需要分页；page参数从0开始计算",
                 "produces": [
                     "application/json"
                 ],
@@ -906,7 +907,7 @@ var doc = `{
                     {
                         "type": "integer",
                         "description": "每页条数",
-                        "name": "size",
+                        "name": "pagesize",
                         "in": "query"
                     },
                     {
@@ -927,6 +928,12 @@ var doc = `{
                         "description": "市场ID",
                         "name": "marketID",
                         "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "方向 - 0:买 1:卖",
+                        "name": "buyorsell",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -1100,9 +1107,13 @@ var doc = `{
                     "description": "页码",
                     "type": "integer"
                 },
-                "size": {
+                "pagesize": {
                     "description": "每页条数",
                     "type": "integer"
+                },
+                "total": {
+                    "description": "总条数",
+                    "type": "integer"
                 }
             }
         },
@@ -2799,7 +2810,7 @@ var doc = `{
                     "type": "integer"
                 },
                 "charge": {
-                    "description": "计算字段",
+                    "description": "手续费",
                     "type": "number"
                 },
                 "closecharge": {
@@ -2839,7 +2850,7 @@ var doc = `{
                     "type": "integer"
                 },
                 "goodscode": {
-                    "description": "关联字段",
+                    "description": "商品代码",
                     "type": "string"
                 },
                 "goodsid": {
@@ -2870,6 +2881,10 @@ var doc = `{
                     "description": "是否结算 - 0:未结算 1:已结算",
                     "type": "integer"
                 },
+                "listingselecttype": {
+                    "description": "关联委托单挂牌点选类型 - 1:挂牌 2:摘牌 3:先摘后挂",
+                    "type": "integer"
+                },
                 "marketid": {
                     "description": "市场ID",
                     "type": "integer"
@@ -2912,7 +2927,7 @@ var doc = `{
                 },
                 "orderid": {
                     "description": "委托单号",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "performanceplanid": {
                     "description": "履约计划ID[期权]",
@@ -2948,7 +2963,7 @@ var doc = `{
                 },
                 "tradeid": {
                     "description": "成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "trademode": {
                     "description": "交易模式",
@@ -2985,7 +3000,6 @@ var doc = `{
                 "goodsid",
                 "marketid",
                 "operatetype",
-                "orderid",
                 "orderqty",
                 "ordertime",
                 "pricemode",
@@ -3007,7 +3021,7 @@ var doc = `{
                 },
                 "cancelorderid": {
                     "description": "撤单单号(撤单时填写)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "cancelqty": {
                     "description": "撤单数量",
@@ -3038,7 +3052,7 @@ var doc = `{
                     "type": "integer"
                 },
                 "enableqty": {
-                    "description": "计算字段",
+                    "description": "可用数量 = 委托数量 - 成交数量 - 撤单数量",
                     "type": "integer"
                 },
                 "freezecharge": {
@@ -3050,7 +3064,7 @@ var doc = `{
                     "type": "number"
                 },
                 "goodscode": {
-                    "description": "关联字段",
+                    "description": "商品代码",
                     "type": "string"
                 },
                 "goodsid": {
@@ -3098,8 +3112,8 @@ var doc = `{
                     "type": "integer"
                 },
                 "orderid": {
-                    "description": "委托单字段",
-                    "type": "integer"
+                    "description": "委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "string"
                 },
                 "orderprice": {
                     "description": "委托价格",
@@ -3123,7 +3137,7 @@ var doc = `{
                 },
                 "preorderid": {
                     "description": "关联预埋单号(止盈止损单时填写)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "pricemode": {
                     "description": "取价方式 - 1:市价 2: 限价",
@@ -3131,7 +3145,7 @@ var doc = `{
                 },
                 "relatedid": {
                     "description": "关联单号(交割单)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "tradedate": {
                     "description": "交易日(yyyyMMdd)",
@@ -3524,7 +3538,7 @@ var doc = `{
                 },
                 "orderid": {
                     "description": "委托单号",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "orderprice": {
                     "description": "委托价格",

docs/swagger.json

@@ -873,6 +873,7 @@
                         "ApiKeyAuth": []
                     }
                 ],
+                "description": "说明：pagesize参数赋值不为0时表示需要分页；page参数从0开始计算",
                 "produces": [
                     "application/json"
                 ],
@@ -890,7 +891,7 @@
                     {
                         "type": "integer",
                         "description": "每页条数",
-                        "name": "size",
+                        "name": "pagesize",
                         "in": "query"
                     },
                     {
@@ -911,6 +912,12 @@
                         "description": "市场ID",
                         "name": "marketID",
                         "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "方向 - 0:买 1:卖",
+                        "name": "buyorsell",
+                        "in": "query"
                     }
                 ],
                 "responses": {
@@ -1084,9 +1091,13 @@
                     "description": "页码",
                     "type": "integer"
                 },
-                "size": {
+                "pagesize": {
                     "description": "每页条数",
                     "type": "integer"
+                },
+                "total": {
+                    "description": "总条数",
+                    "type": "integer"
                 }
             }
         },
@@ -2783,7 +2794,7 @@
                     "type": "integer"
                 },
                 "charge": {
-                    "description": "计算字段",
+                    "description": "手续费",
                     "type": "number"
                 },
                 "closecharge": {
@@ -2823,7 +2834,7 @@
                     "type": "integer"
                 },
                 "goodscode": {
-                    "description": "关联字段",
+                    "description": "商品代码",
                     "type": "string"
                 },
                 "goodsid": {
@@ -2854,6 +2865,10 @@
                     "description": "是否结算 - 0:未结算 1:已结算",
                     "type": "integer"
                 },
+                "listingselecttype": {
+                    "description": "关联委托单挂牌点选类型 - 1:挂牌 2:摘牌 3:先摘后挂",
+                    "type": "integer"
+                },
                 "marketid": {
                     "description": "市场ID",
                     "type": "integer"
@@ -2896,7 +2911,7 @@
                 },
                 "orderid": {
                     "description": "委托单号",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "performanceplanid": {
                     "description": "履约计划ID[期权]",
@@ -2932,7 +2947,7 @@
                 },
                 "tradeid": {
                     "description": "成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "trademode": {
                     "description": "交易模式",
@@ -2969,7 +2984,6 @@
                 "goodsid",
                 "marketid",
                 "operatetype",
-                "orderid",
                 "orderqty",
                 "ordertime",
                 "pricemode",
@@ -2991,7 +3005,7 @@
                 },
                 "cancelorderid": {
                     "description": "撤单单号(撤单时填写)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "cancelqty": {
                     "description": "撤单数量",
@@ -3022,7 +3036,7 @@
                     "type": "integer"
                 },
                 "enableqty": {
-                    "description": "计算字段",
+                    "description": "可用数量 = 委托数量 - 成交数量 - 撤单数量",
                     "type": "integer"
                 },
                 "freezecharge": {
@@ -3034,7 +3048,7 @@
                     "type": "number"
                 },
                 "goodscode": {
-                    "description": "关联字段",
+                    "description": "商品代码",
                     "type": "string"
                 },
                 "goodsid": {
@@ -3082,8 +3096,8 @@
                     "type": "integer"
                 },
                 "orderid": {
-                    "description": "委托单字段",
-                    "type": "integer"
+                    "description": "委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
+                    "type": "string"
                 },
                 "orderprice": {
                     "description": "委托价格",
@@ -3107,7 +3121,7 @@
                 },
                 "preorderid": {
                     "description": "关联预埋单号(止盈止损单时填写)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "pricemode": {
                     "description": "取价方式 - 1:市价 2: 限价",
@@ -3115,7 +3129,7 @@
                 },
                 "relatedid": {
                     "description": "关联单号(交割单)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "tradedate": {
                     "description": "交易日(yyyyMMdd)",
@@ -3508,7 +3522,7 @@
                 },
                 "orderid": {
                     "description": "委托单号",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "orderprice": {
                     "description": "委托价格",

docs/swagger.yaml

@@ -11,9 +11,12 @@ definitions:
       page:
         description: 页码
         type: integer
-      size:
+      pagesize:
         description: 每页条数
         type: integer
+      total:
+        description: 总条数
+        type: integer
     type: object
   common.OperationPrimaryMenu:
     properties:
@@ -1264,7 +1267,7 @@ definitions:
         description: 方向 - 0:买 1:卖
         type: integer
       charge:
-        description: 计算字段
+        description: 手续费
         type: number
       closecharge:
         description: 平仓手续费(支付总手续费=(交易所比率+会员比率)*成交金额)
@@ -1294,7 +1297,7 @@ definitions:
         description: 账户ID[合约币种]
         type: integer
       goodscode:
-        description: 关联字段
+        description: 商品代码
         type: string
       goodsid:
         description: 商品ID
@@ -1317,6 +1320,9 @@ definitions:
       isreckoned:
         description: 是否结算 - 0:未结算 1:已结算
         type: integer
+      listingselecttype:
+        description: 关联委托单挂牌点选类型 - 1:挂牌 2:摘牌 3:先摘后挂
+        type: integer
       marketid:
         description: 市场ID
         type: integer
@@ -1349,7 +1355,7 @@ definitions:
         type: integer
       orderid:
         description: 委托单号
-        type: integer
+        type: string
       performanceplanid:
         description: 履约计划ID[期权]
         type: integer
@@ -1376,7 +1382,7 @@ definitions:
         type: string
       tradeid:
         description: 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
-        type: integer
+        type: string
       trademode:
         description: 交易模式
         type: integer
@@ -1422,7 +1428,7 @@ definitions:
         type: integer
       cancelorderid:
         description: 撤单单号(撤单时填写)
-        type: integer
+        type: string
       cancelqty:
         description: 撤单数量
         type: integer
@@ -1445,7 +1451,7 @@ definitions:
         description: 摘牌类型 - 1:价格最优 2:点选成交
         type: integer
       enableqty:
-        description: 计算字段
+        description: 可用数量 = 委托数量 - 成交数量 - 撤单数量
         type: integer
       freezecharge:
         description: 冻结手续费
@@ -1454,7 +1460,7 @@ definitions:
         description: 冻结保证金(冻结交易金额)
         type: number
       goodscode:
-        description: 关联字段
+        description: 商品代码
         type: string
       goodsid:
         description: 商品ID
@@ -1490,8 +1496,8 @@ definitions:
         description: 登录账号(LoginID)
         type: integer
       orderid:
-        description: 委托单字段
-        type: integer
+        description: 委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+        type: string
       orderprice:
         description: 委托价格
         type: number
@@ -1509,13 +1515,13 @@ definitions:
         type: string
       preorderid:
         description: 关联预埋单号(止盈止损单时填写)
-        type: integer
+        type: string
       pricemode:
         description: '取价方式 - 1:市价 2: 限价'
         type: integer
       relatedid:
         description: 关联单号(交割单)
-        type: integer
+        type: string
       tradedate:
         description: 交易日(yyyyMMdd)
         type: string
@@ -1547,7 +1553,6 @@ definitions:
     - goodsid
     - marketid
     - operatetype
-    - orderid
     - orderqty
     - ordertime
     - pricemode
@@ -1819,7 +1824,7 @@ definitions:
         type: string
       orderid:
         description: 委托单号
-        type: integer
+        type: string
       orderprice:
         description: 委托价格
         type: number
@@ -2373,6 +2378,7 @@ paths:
       - 定制【尚志大宗】
   /SZDZ/QueryRecieptOrder:
     get:
+      description: 说明：pagesize参数赋值不为0时表示需要分页；page参数从0开始计算
       parameters:
       - description: 页码
         in: query
@@ -2380,7 +2386,7 @@ paths:
         type: integer
       - description: 每页条数
         in: query
-        name: size
+        name: pagesize
         type: integer
       - description: 商品ID
         in: query
@@ -2395,6 +2401,10 @@ paths:
         in: query
         name: marketID
         type: integer
+      - description: 方向 - 0:买 1:卖
+        in: query
+        name: buyorsell
+        type: integer
       produces:
       - application/json
       responses:

global/app/request.go

@@ -2,6 +2,7 @@ package app
 
 // PageInfo 分页模型
 type PageInfo struct {
-	Page int `json:"page"` // 页码
-	Size int `json:"size"` // 每页条数
+	Page     int `json:"page" form:"page"`         // 页码
+	PageSize int `json:"pagesize" form:"pagesize"` // 每页条数
+	Total    int `json:"total"`                    // 总条数
 }

models/orderModels.go

@@ -149,9 +149,9 @@ func (Tradequotedetailnew) TableName() string {
 
 // Tradetradedetail 交易成交单表 - 导历史
 type Tradetradedetail struct {
-	Tradeid                 uint64    `json:"tradeid"  xorm:"'TRADEID'" binding:"required"`              // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	Tradeid                 string    `json:"tradeid"  xorm:"'TRADEID'" binding:"required"`              // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
 	Buyorsell               uint32    `json:"buyorsell"  xorm:"'BUYORSELL'" binding:"required"`          // 方向 - 0:买 1:卖
-	Orderid                 uint64    `json:"orderid"  xorm:"'ORDERID'" binding:"required"`              // 委托单号
+	Orderid                 string    `json:"orderid"  xorm:"'ORDERID'" binding:"required"`              // 委托单号
 	Tradedate               string    `json:"tradedate"  xorm:"'TRADEDATE'" binding:"required"`          // 交易日(yyyyMMdd)
 	Accountid               uint64    `json:"accountid"  xorm:"'ACCOUNTID'" binding:"required"`          // 账户ID[报价币种]
 	Goodsid                 uint32    `json:"goodsid"  xorm:"'GOODSID'" binding:"required"`              // 商品ID