1.掉买卖大厅增加取价方式、点差字段

docs/docs.go

@@ -30472,6 +30472,10 @@ var doc = `{
                     "description": "商品id",
                     "type": "integer"
                 },
+                "marketmaxsub": {
+                    "description": "市价最大偏移范围 [浮动价 - 点差]",
+                    "type": "number"
+                },
                 "orderid": {
                     "description": "委托单号",
                     "type": "string"
@@ -30484,6 +30488,10 @@ var doc = `{
                     "description": "委托数量",
                     "type": "integer"
                 },
+                "pricemode": {
+                    "description": "取价方式 - 1:市价 2: 限价 3:浮动价",
+                    "type": "integer"
+                },
                 "userid": {
                     "description": "用户id",
                     "type": "integer"

docs/swagger.json

@@ -30456,6 +30456,10 @@
                     "description": "商品id",
                     "type": "integer"
                 },
+                "marketmaxsub": {
+                    "description": "市价最大偏移范围 [浮动价 - 点差]",
+                    "type": "number"
+                },
                 "orderid": {
                     "description": "委托单号",
                     "type": "string"
@@ -30468,6 +30472,10 @@
                     "description": "委托数量",
                     "type": "integer"
                 },
+                "pricemode": {
+                    "description": "取价方式 - 1:市价 2: 限价 3:浮动价",
+                    "type": "integer"
+                },
                 "userid": {
                     "description": "用户id",
                     "type": "integer"

docs/swagger.yaml

@@ -12937,6 +12937,9 @@ definitions:
       goodsid:
         description: 商品id
         type: integer
+      marketmaxsub:
+        description: 市价最大偏移范围 [浮动价 - 点差]
+        type: number
       orderid:
         description: 委托单号
         type: string
@@ -12946,6 +12949,9 @@ definitions:
       orderqty:
         description: 委托数量
         type: integer
+      pricemode:
+        description: '取价方式 - 1:市价 2: 限价 3:浮动价'
+        type: integer
       userid:
         description: 用户id
         type: integer

models/tjmd.go

@@ -70,14 +70,16 @@ func (r *TjmdQuoteGoods) GetDataEx() (interface{}, error) {
 
 // TjmdTradeOrderDetail 买卖大厅
 type TjmdTradeOrderDetail struct {
-	ORDERID    string   `json:"orderid"  xorm:"'ORDERID'"`                      // 委托单号
-	GOODSID    int32    `json:"goodsid"  xorm:"'GOODSID'" form:"goodsid"`       // 商品id
-	BUYORSELL  int32    `json:"buyorsell"  xorm:"'BUYORSELL'" form:"buyorsell"` // 买卖方向 0-买 1-卖
-	ORDERPRICE SFLOAT64 `json:"orderprice"  xorm:"'ORDERPRICE'"`                // 委托价格
-	ORDERQTY   int64    `json:"orderqty"  xorm:"'ORDERQTY'"`                    // 委托数量
-	USERID     int64    `json:"userid"  xorm:"'USERID'"`                        // 用户id
-	USERNAME   string   `json:"username"  xorm:"'USERNAME'"`                    // 用户名称(已脱敏)
-	PageEx     `xorm:"extends"`
+	ORDERID      string   `json:"orderid"  xorm:"'ORDERID'"`                      // 委托单号
+	GOODSID      int32    `json:"goodsid"  xorm:"'GOODSID'" form:"goodsid"`       // 商品id
+	BUYORSELL    int32    `json:"buyorsell"  xorm:"'BUYORSELL'" form:"buyorsell"` // 买卖方向 0-买 1-卖
+	ORDERPRICE   SFLOAT64 `json:"orderprice"  xorm:"'ORDERPRICE'"`                // 委托价格
+	ORDERQTY     int64    `json:"orderqty"  xorm:"'ORDERQTY'"`                    // 委托数量
+	USERID       int64    `json:"userid"  xorm:"'USERID'"`                        // 用户id
+	USERNAME     string   `json:"username"  xorm:"'USERNAME'"`                    // 用户名称(已脱敏)
+	PRICEMODE    int32    `json:"pricemode"  xorm:"'PRICEMODE'"`                  // 取价方式 - 1:市价 2: 限价 3:浮动价
+	MARKETMAXSUB float64  `json:"marketmaxsub"  xorm:"'MARKETMAXSUB'"`            // 市价最大偏移范围 [浮动价 - 点差]
+	PageEx       `xorm:"extends"`
 
 	USERTYPE    int32  `json:"-" form:"usertype"`  // 用户类型
 	FtMarketIds string `json:"-" form:"marketids"` // 市场id, 格式 1,2,3
@@ -97,6 +99,8 @@ select to_char(t.orderid) orderid,
        u.userid,
        u.accountname username,
        t.orderstatus,
+       t.pricemode,
+       t.marketmaxsub,
        g.marketid
   from trade_orderdetail t
   left join taaccount ta