Browse Source

修改“查询产能预售委托单信息”接口中“委托单号”的BUG

Simon Zhou 5 years ago
parent
commit
351ae38b2e
4 changed files with 17 additions and 16 deletions
  1. 3 2
      controllers/cptrade/cpTrade.go
  2. 5 5
      docs/docs.go
  3. 5 5
      docs/swagger.json
  4. 4 4
      docs/swagger.yaml

+ 3 - 2
controllers/cptrade/cpTrade.go

@@ -656,7 +656,7 @@ type QueryCPTradeOrderDetailReq struct {
 
 // QueryCPTradeOrderDetailRsq 产能预售委托单信息
 type QueryCPTradeOrderDetailRsq struct {
-	Orderid                 int64     `json:"orderid"  xorm:"'ORDERID'" binding:"required"`              // 委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	Strorderid              string    `json:"strorderid"  xorm:"'STRORDERID'" binding:"required"`        // 委托单号
 	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'"`                           // 关联预埋单号(止盈止损单时填写)
@@ -746,7 +746,8 @@ func QueryCPTradeOrderDetail(c *gin.Context) {
 	// 查询数据
 	engine := db.GetEngine()
 	datas := make([]QueryCPTradeOrderDetailRsq, 0)
-	sql := `select 
+	sql := `select
+				to_char(t.orderid) strOrderID, 
 				t.*
 			from Trade_OrderDetail t
 			where t.BuyOrSell = 1 and t.BuildType = 2 and t.MarketID in (40201,41201)`

+ 5 - 5
docs/docs.go

@@ -799,10 +799,10 @@ var doc = `{
                 "marketid",
                 "memberuserid",
                 "operatetype",
-                "orderid",
                 "orderqty",
                 "ordertime",
                 "pricemode",
+                "strorderid",
                 "tradedate",
                 "validtype"
             ],
@@ -959,10 +959,6 @@ var doc = `{
                     "description": "期权类型 - 1:认购(看涨) 2:认沽(看跌)",
                     "type": "integer"
                 },
-                "orderid": {
-                    "description": "委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
-                },
                 "orderprice": {
                     "description": "委托价格",
                     "type": "number"
@@ -1015,6 +1011,10 @@ var doc = `{
                     "description": "会话ID",
                     "type": "integer"
                 },
+                "strorderid": {
+                    "description": "委托单号",
+                    "type": "string"
+                },
                 "tradedate": {
                     "description": "交易日(yyyyMMdd)",
                     "type": "string"

+ 5 - 5
docs/swagger.json

@@ -783,10 +783,10 @@
                 "marketid",
                 "memberuserid",
                 "operatetype",
-                "orderid",
                 "orderqty",
                 "ordertime",
                 "pricemode",
+                "strorderid",
                 "tradedate",
                 "validtype"
             ],
@@ -943,10 +943,6 @@
                     "description": "期权类型 - 1:认购(看涨) 2:认沽(看跌)",
                     "type": "integer"
                 },
-                "orderid": {
-                    "description": "委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
-                },
                 "orderprice": {
                     "description": "委托价格",
                     "type": "number"
@@ -999,6 +995,10 @@
                     "description": "会话ID",
                     "type": "integer"
                 },
+                "strorderid": {
+                    "description": "委托单号",
+                    "type": "string"
+                },
                 "tradedate": {
                     "description": "交易日(yyyyMMdd)",
                     "type": "string"

+ 4 - 4
docs/swagger.yaml

@@ -366,9 +366,6 @@ definitions:
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
         type: integer
-      orderid:
-        description: 委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
-        type: integer
       orderprice:
         description: 委托价格
         type: number
@@ -408,6 +405,9 @@ definitions:
       sessionid:
         description: 会话ID
         type: integer
+      strorderid:
+        description: 委托单号
+        type: string
       tradedate:
         description: 交易日(yyyyMMdd)
         type: string
@@ -446,10 +446,10 @@ definitions:
     - marketid
     - memberuserid
     - operatetype
-    - orderid
     - orderqty
     - ordertime
     - pricemode
+    - strorderid
     - tradedate
     - validtype
     type: object