Kaynağa Gözat

增加查询市场交易参数配置接口

zou.yingbin 4 yıl önce
ebeveyn
işleme
aae225266e
6 değiştirilmiş dosya ile 571 ekleme ve 0 silme
  1. 16 0
      controllers/wrTrade2/qryWrTrade.go
  2. 182 0
      docs/docs.go
  3. 182 0
      docs/swagger.json
  4. 132 0
      docs/swagger.yaml
  5. 58 0
      models/wrTrade2.go
  6. 1 0
      routers/router.go

+ 16 - 0
controllers/wrTrade2/qryWrTrade.go

@@ -243,3 +243,19 @@ func QueryWrFactorTypeInfo(c *gin.Context) {
 	a.DoBindReq(&m)
 	a.DoGetDataI(&m)
 }
+
+// QueryWrMarketTradeConfig
+// @Summary 查询市场交易参数配置
+// @Produce json
+// @Security ApiKeyAuth
+// @Param marketid query int false "市场id"
+// @Success 200 {array} models.WrMarketTradeConfig
+// @Failure 500 {object} app.Response
+// @Router /WrTrade2/QueryWrMarketTradeConfig [get]
+// @Tags 仓单贸易v2
+func QueryWrMarketTradeConfig(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.WrMarketTradeConfig{}
+	a.DoBindReq(&m)
+	a.DoGetDataI(&m)
+}

+ 182 - 0
docs/docs.go

@@ -11403,6 +11403,47 @@ var doc = `{
                 }
             }
         },
+        "/WrTrade2/QueryWrMarketTradeConfig": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "仓单贸易v2"
+                ],
+                "summary": "查询市场交易参数配置",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "市场id",
+                        "name": "marketid",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.WrMarketTradeConfig"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/WrTrade2/QueryWrOrderDetail": {
             "get": {
                 "security": [
@@ -29833,6 +29874,147 @@ var doc = `{
                 }
             }
         },
+        "models.WrMarketTradeConfig": {
+            "type": "object",
+            "properties": {
+                "buychargealgorithm": {
+                    "description": "买方手续费收取方式 1:比率  2:固定",
+                    "type": "integer"
+                },
+                "buychargealgorithm2": {
+                    "description": "回购买方手续费收取方式 1:比率  2:固定 --77:现货商城",
+                    "type": "integer"
+                },
+                "buychargealgorithmvalue": {
+                    "description": "买方手续费设置值(交易所部分)",
+                    "type": "number"
+                },
+                "buychargealgorithmvalue2": {
+                    "description": "买方手续费设置值(会员部分)",
+                    "type": "number"
+                },
+                "buychargealgorithmvalue3": {
+                    "description": "回购买方手续费设置值(交易所部分) --77:现货商城",
+                    "type": "number"
+                },
+                "buychargealgorithmvalue4": {
+                    "description": "回购买方手续费设置值(会员部分) --77:现货商城",
+                    "type": "number"
+                },
+                "buyfirstmarginalgorithm": {
+                    "description": "买方出价保证金方式 - 1:比率  2:固定 - [竞拍]",
+                    "type": "integer"
+                },
+                "buyfirstmarginvalue": {
+                    "description": "买方出价保证金设置值 - [竞拍]",
+                    "type": "number"
+                },
+                "buymarginalgorithm": {
+                    "description": "买方保证金方式 - 1:比率  2:固定",
+                    "type": "integer"
+                },
+                "buymarginvalue": {
+                    "description": "买方保证金设置值",
+                    "type": "number"
+                },
+                "buyreleaseratio": {
+                    "description": "买方释放比率[2:分步履约]",
+                    "type": "number"
+                },
+                "executemode": {
+                    "description": "执行方式[2:分步履约] - 1:顺序执行 2:交叉执行",
+                    "type": "integer"
+                },
+                "executeside": {
+                    "description": "执行方[2:分步履约] - 1:买方 2:卖方",
+                    "type": "integer"
+                },
+                "failedchargealgorithm": {
+                    "description": "流拍手续费收取方式  1:比率  2:固定",
+                    "type": "integer"
+                },
+                "failedchargevalue": {
+                    "description": "流拍手续费设置值",
+                    "type": "number"
+                },
+                "failedchargevalue2": {
+                    "description": "流拍卖方手续费设置值",
+                    "type": "number"
+                },
+                "holddays": {
+                    "description": "合同期限[2:分步履约]",
+                    "type": "integer"
+                },
+                "marketid": {
+                    "description": "市场ID-仓单贸易、竞拍、预售",
+                    "type": "integer"
+                },
+                "minqty": {
+                    "description": "最小执行量[2:分步履约]",
+                    "type": "number"
+                },
+                "modifierid": {
+                    "description": "修改人",
+                    "type": "integer"
+                },
+                "performancetempid": {
+                    "description": "履约计划模板ID(有仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约方式: 立即执行(-1)",
+                    "type": "integer"
+                },
+                "performancetempid2": {
+                    "description": "履约计划模板ID(无仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约方式: 立即执行",
+                    "type": "integer"
+                },
+                "performanceway": {
+                    "description": "交货模式 - 1:履约计划 2:分步履约 3:分步提货[文昌]",
+                    "type": "integer"
+                },
+                "sellchargealgorithm": {
+                    "description": "卖方手续费收取方式  1:比率  2:固定",
+                    "type": "integer"
+                },
+                "sellchargealgorithm2": {
+                    "description": "回购卖方手续费收取方式  1:比率  2:固定 --77:现货商城",
+                    "type": "integer"
+                },
+                "sellchargealgorithmvalue": {
+                    "description": "卖方手续费设置值(交易所部分)",
+                    "type": "number"
+                },
+                "sellchargealgorithmvalue2": {
+                    "description": "卖方手续费设置值(会员部分)",
+                    "type": "number"
+                },
+                "sellchargealgorithmvalue3": {
+                    "description": "回购卖方手续费设置值(交易所部分) --77:现货商城",
+                    "type": "number"
+                },
+                "sellchargealgorithmvalue4": {
+                    "description": "回购卖方手续费设置值(会员部分) --77:现货商城",
+                    "type": "number"
+                },
+                "sellmarginalgorithm": {
+                    "description": "卖方保证金方式 - 1:比率  2:固定",
+                    "type": "integer"
+                },
+                "sellmarginvalue": {
+                    "description": "卖方保证金设置值",
+                    "type": "number"
+                },
+                "sellmarginvalue2": {
+                    "description": "卖方保证金设置值(无仓单)",
+                    "type": "number"
+                },
+                "sellreleaseratio": {
+                    "description": "卖方释放比率[2:分步履约]",
+                    "type": "number"
+                },
+                "updatetime": {
+                    "description": "更新时间",
+                    "type": "string"
+                }
+            }
+        },
         "models.WrOrderDetail": {
             "type": "object",
             "properties": {

+ 182 - 0
docs/swagger.json

@@ -11387,6 +11387,47 @@
                 }
             }
         },
+        "/WrTrade2/QueryWrMarketTradeConfig": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "仓单贸易v2"
+                ],
+                "summary": "查询市场交易参数配置",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "市场id",
+                        "name": "marketid",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.WrMarketTradeConfig"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/WrTrade2/QueryWrOrderDetail": {
             "get": {
                 "security": [
@@ -29817,6 +29858,147 @@
                 }
             }
         },
+        "models.WrMarketTradeConfig": {
+            "type": "object",
+            "properties": {
+                "buychargealgorithm": {
+                    "description": "买方手续费收取方式 1:比率  2:固定",
+                    "type": "integer"
+                },
+                "buychargealgorithm2": {
+                    "description": "回购买方手续费收取方式 1:比率  2:固定 --77:现货商城",
+                    "type": "integer"
+                },
+                "buychargealgorithmvalue": {
+                    "description": "买方手续费设置值(交易所部分)",
+                    "type": "number"
+                },
+                "buychargealgorithmvalue2": {
+                    "description": "买方手续费设置值(会员部分)",
+                    "type": "number"
+                },
+                "buychargealgorithmvalue3": {
+                    "description": "回购买方手续费设置值(交易所部分) --77:现货商城",
+                    "type": "number"
+                },
+                "buychargealgorithmvalue4": {
+                    "description": "回购买方手续费设置值(会员部分) --77:现货商城",
+                    "type": "number"
+                },
+                "buyfirstmarginalgorithm": {
+                    "description": "买方出价保证金方式 - 1:比率  2:固定 - [竞拍]",
+                    "type": "integer"
+                },
+                "buyfirstmarginvalue": {
+                    "description": "买方出价保证金设置值 - [竞拍]",
+                    "type": "number"
+                },
+                "buymarginalgorithm": {
+                    "description": "买方保证金方式 - 1:比率  2:固定",
+                    "type": "integer"
+                },
+                "buymarginvalue": {
+                    "description": "买方保证金设置值",
+                    "type": "number"
+                },
+                "buyreleaseratio": {
+                    "description": "买方释放比率[2:分步履约]",
+                    "type": "number"
+                },
+                "executemode": {
+                    "description": "执行方式[2:分步履约] - 1:顺序执行 2:交叉执行",
+                    "type": "integer"
+                },
+                "executeside": {
+                    "description": "执行方[2:分步履约] - 1:买方 2:卖方",
+                    "type": "integer"
+                },
+                "failedchargealgorithm": {
+                    "description": "流拍手续费收取方式  1:比率  2:固定",
+                    "type": "integer"
+                },
+                "failedchargevalue": {
+                    "description": "流拍手续费设置值",
+                    "type": "number"
+                },
+                "failedchargevalue2": {
+                    "description": "流拍卖方手续费设置值",
+                    "type": "number"
+                },
+                "holddays": {
+                    "description": "合同期限[2:分步履约]",
+                    "type": "integer"
+                },
+                "marketid": {
+                    "description": "市场ID-仓单贸易、竞拍、预售",
+                    "type": "integer"
+                },
+                "minqty": {
+                    "description": "最小执行量[2:分步履约]",
+                    "type": "number"
+                },
+                "modifierid": {
+                    "description": "修改人",
+                    "type": "integer"
+                },
+                "performancetempid": {
+                    "description": "履约计划模板ID(有仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约方式: 立即执行(-1)",
+                    "type": "integer"
+                },
+                "performancetempid2": {
+                    "description": "履约计划模板ID(无仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约方式: 立即执行",
+                    "type": "integer"
+                },
+                "performanceway": {
+                    "description": "交货模式 - 1:履约计划 2:分步履约 3:分步提货[文昌]",
+                    "type": "integer"
+                },
+                "sellchargealgorithm": {
+                    "description": "卖方手续费收取方式  1:比率  2:固定",
+                    "type": "integer"
+                },
+                "sellchargealgorithm2": {
+                    "description": "回购卖方手续费收取方式  1:比率  2:固定 --77:现货商城",
+                    "type": "integer"
+                },
+                "sellchargealgorithmvalue": {
+                    "description": "卖方手续费设置值(交易所部分)",
+                    "type": "number"
+                },
+                "sellchargealgorithmvalue2": {
+                    "description": "卖方手续费设置值(会员部分)",
+                    "type": "number"
+                },
+                "sellchargealgorithmvalue3": {
+                    "description": "回购卖方手续费设置值(交易所部分) --77:现货商城",
+                    "type": "number"
+                },
+                "sellchargealgorithmvalue4": {
+                    "description": "回购卖方手续费设置值(会员部分) --77:现货商城",
+                    "type": "number"
+                },
+                "sellmarginalgorithm": {
+                    "description": "卖方保证金方式 - 1:比率  2:固定",
+                    "type": "integer"
+                },
+                "sellmarginvalue": {
+                    "description": "卖方保证金设置值",
+                    "type": "number"
+                },
+                "sellmarginvalue2": {
+                    "description": "卖方保证金设置值(无仓单)",
+                    "type": "number"
+                },
+                "sellreleaseratio": {
+                    "description": "卖方释放比率[2:分步履约]",
+                    "type": "number"
+                },
+                "updatetime": {
+                    "description": "更新时间",
+                    "type": "string"
+                }
+            }
+        },
         "models.WrOrderDetail": {
             "type": "object",
             "properties": {

+ 132 - 0
docs/swagger.yaml

@@ -13540,6 +13540,113 @@ definitions:
         description: 商品
         type: string
     type: object
+  models.WrMarketTradeConfig:
+    properties:
+      buychargealgorithm:
+        description: 买方手续费收取方式 1:比率  2:固定
+        type: integer
+      buychargealgorithm2:
+        description: 回购买方手续费收取方式 1:比率  2:固定 --77:现货商城
+        type: integer
+      buychargealgorithmvalue:
+        description: 买方手续费设置值(交易所部分)
+        type: number
+      buychargealgorithmvalue2:
+        description: 买方手续费设置值(会员部分)
+        type: number
+      buychargealgorithmvalue3:
+        description: 回购买方手续费设置值(交易所部分) --77:现货商城
+        type: number
+      buychargealgorithmvalue4:
+        description: 回购买方手续费设置值(会员部分) --77:现货商城
+        type: number
+      buyfirstmarginalgorithm:
+        description: 买方出价保证金方式 - 1:比率  2:固定 - [竞拍]
+        type: integer
+      buyfirstmarginvalue:
+        description: 买方出价保证金设置值 - [竞拍]
+        type: number
+      buymarginalgorithm:
+        description: 买方保证金方式 - 1:比率  2:固定
+        type: integer
+      buymarginvalue:
+        description: 买方保证金设置值
+        type: number
+      buyreleaseratio:
+        description: 买方释放比率[2:分步履约]
+        type: number
+      executemode:
+        description: 执行方式[2:分步履约] - 1:顺序执行 2:交叉执行
+        type: integer
+      executeside:
+        description: 执行方[2:分步履约] - 1:买方 2:卖方
+        type: integer
+      failedchargealgorithm:
+        description: 流拍手续费收取方式  1:比率  2:固定
+        type: integer
+      failedchargevalue:
+        description: 流拍手续费设置值
+        type: number
+      failedchargevalue2:
+        description: 流拍卖方手续费设置值
+        type: number
+      holddays:
+        description: 合同期限[2:分步履约]
+        type: integer
+      marketid:
+        description: 市场ID-仓单贸易、竞拍、预售
+        type: integer
+      minqty:
+        description: 最小执行量[2:分步履约]
+        type: number
+      modifierid:
+        description: 修改人
+        type: integer
+      performancetempid:
+        description: 履约计划模板ID(有仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约方式:
+          立即执行(-1)
+        type: integer
+      performancetempid2:
+        description: 履约计划模板ID(无仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约方式:
+          立即执行
+        type: integer
+      performanceway:
+        description: 交货模式 - 1:履约计划 2:分步履约 3:分步提货[文昌]
+        type: integer
+      sellchargealgorithm:
+        description: 卖方手续费收取方式  1:比率  2:固定
+        type: integer
+      sellchargealgorithm2:
+        description: 回购卖方手续费收取方式  1:比率  2:固定 --77:现货商城
+        type: integer
+      sellchargealgorithmvalue:
+        description: 卖方手续费设置值(交易所部分)
+        type: number
+      sellchargealgorithmvalue2:
+        description: 卖方手续费设置值(会员部分)
+        type: number
+      sellchargealgorithmvalue3:
+        description: 回购卖方手续费设置值(交易所部分) --77:现货商城
+        type: number
+      sellchargealgorithmvalue4:
+        description: 回购卖方手续费设置值(会员部分) --77:现货商城
+        type: number
+      sellmarginalgorithm:
+        description: 卖方保证金方式 - 1:比率  2:固定
+        type: integer
+      sellmarginvalue:
+        description: 卖方保证金设置值
+        type: number
+      sellmarginvalue2:
+        description: 卖方保证金设置值(无仓单)
+        type: number
+      sellreleaseratio:
+        description: 卖方释放比率[2:分步履约]
+        type: number
+      updatetime:
+        description: 更新时间
+        type: string
+    type: object
   models.WrOrderDetail:
     properties:
       buyorsell:
@@ -23374,6 +23481,31 @@ paths:
       summary: 查询仓单商品信息
       tags:
       - 仓单贸易v2
+  /WrTrade2/QueryWrMarketTradeConfig:
+    get:
+      parameters:
+      - description: 市场id
+        in: query
+        name: marketid
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.WrMarketTradeConfig'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 查询市场交易参数配置
+      tags:
+      - 仓单贸易v2
   /WrTrade2/QueryWrOrderDetail:
     get:
       description: 页面 现货仓单 | 预售仓单 -> 挂单

+ 58 - 0
models/wrTrade2.go

@@ -1572,3 +1572,61 @@ func (r *WrFAProductDetail) GetDataEx() (interface{}, error) {
 	}
 	return sData, nil
 }
+
+// WrMarketTradeConfig 市场交易参数配置
+type WrMarketTradeConfig struct {
+	MARKETID                  int32   `json:"marketid"  xorm:"MARKETID" form:"marketid"`                                                    // 市场ID-仓单贸易、竞拍、预售
+	BUYMARGINALGORITHM        int32   `json:"buymarginalgorithm"  xorm:"BUYMARGINALGORITHM" form:"buymarginalgorithm"`                      // 买方保证金方式 - 1:比率  2:固定
+	BUYMARGINVALUE            float64 `json:"buymarginvalue"  xorm:"BUYMARGINVALUE" form:"buymarginvalue"`                                  // 买方保证金设置值
+	SELLMARGINALGORITHM       int32   `json:"sellmarginalgorithm"  xorm:"SELLMARGINALGORITHM" form:"sellmarginalgorithm"`                   // 卖方保证金方式 - 1:比率  2:固定
+	SELLMARGINVALUE           float64 `json:"sellmarginvalue"  xorm:"SELLMARGINVALUE" form:"sellmarginvalue"`                               // 卖方保证金设置值
+	SELLMARGINVALUE2          float64 `json:"sellmarginvalue2"  xorm:"SELLMARGINVALUE2" form:"sellmarginvalue2"`                            // 卖方保证金设置值(无仓单)
+	BUYCHARGEALGORITHM        int32   `json:"buychargealgorithm"  xorm:"BUYCHARGEALGORITHM" form:"buychargealgorithm"`                      // 买方手续费收取方式 1:比率  2:固定
+	BUYCHARGEALGORITHMVALUE   float64 `json:"buychargealgorithmvalue"  xorm:"BUYCHARGEALGORITHMVALUE" form:"buychargealgorithmvalue"`       // 买方手续费设置值(交易所部分)
+	BUYCHARGEALGORITHMVALUE2  float64 `json:"buychargealgorithmvalue2"  xorm:"BUYCHARGEALGORITHMVALUE2" form:"buychargealgorithmvalue2"`    // 买方手续费设置值(会员部分)
+	SELLCHARGEALGORITHM       int32   `json:"sellchargealgorithm"  xorm:"SELLCHARGEALGORITHM" form:"sellchargealgorithm"`                   // 卖方手续费收取方式  1:比率  2:固定
+	SELLCHARGEALGORITHMVALUE  float64 `json:"sellchargealgorithmvalue"  xorm:"SELLCHARGEALGORITHMVALUE" form:"sellchargealgorithmvalue"`    // 卖方手续费设置值(交易所部分)
+	SELLCHARGEALGORITHMVALUE2 float64 `json:"sellchargealgorithmvalue2"  xorm:"SELLCHARGEALGORITHMVALUE2" form:"sellchargealgorithmvalue2"` // 卖方手续费设置值(会员部分)
+	FAILEDCHARGEALGORITHM     int32   `json:"failedchargealgorithm"  xorm:"FAILEDCHARGEALGORITHM" form:"failedchargealgorithm"`             // 流拍手续费收取方式  1:比率  2:固定
+	FAILEDCHARGEVALUE         float64 `json:"failedchargevalue"  xorm:"FAILEDCHARGEVALUE" form:"failedchargevalue"`                         // 流拍手续费设置值
+	FAILEDCHARGEVALUE2        float64 `json:"failedchargevalue2"  xorm:"FAILEDCHARGEVALUE2" form:"failedchargevalue2"`                      // 流拍卖方手续费设置值
+	BUYFIRSTMARGINALGORITHM   int32   `json:"buyfirstmarginalgorithm"  xorm:"BUYFIRSTMARGINALGORITHM" form:"buyfirstmarginalgorithm"`       // 买方出价保证金方式 - 1:比率  2:固定 - [竞拍]
+	BUYFIRSTMARGINVALUE       float64 `json:"buyfirstmarginvalue"  xorm:"BUYFIRSTMARGINVALUE" form:"buyfirstmarginvalue"`                   // 买方出价保证金设置值 - [竞拍]
+	PERFORMANCEWAY            int32   `json:"performanceway"  xorm:"PERFORMANCEWAY" form:"performanceway"`                                  // 交货模式 - 1:履约计划 2:分步履约 3:分步提货[文昌]
+	PERFORMANCETEMPID         int64   `json:"performancetempid"  xorm:"PERFORMANCETEMPID" form:"performancetempid"`                         // 履约计划模板ID(有仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约方式: 立即执行(-1)
+	PERFORMANCETEMPID2        int64   `json:"performancetempid2"  xorm:"PERFORMANCETEMPID2" form:"performancetempid2"`                      // 履约计划模板ID(无仓单) - 根据交货模式:1:履约 - 履约计划模板2:分步履约 - 履约计划模板3:分步提货 - 履约方式: 立即执行
+	BUYRELEASERATIO           float64 `json:"buyreleaseratio"  xorm:"BUYRELEASERATIO" form:"buyreleaseratio"`                               // 买方释放比率[2:分步履约]
+	SELLRELEASERATIO          float64 `json:"sellreleaseratio"  xorm:"SELLRELEASERATIO" form:"sellreleaseratio"`                            // 卖方释放比率[2:分步履约]
+	EXECUTEMODE               int32   `json:"executemode"  xorm:"EXECUTEMODE" form:"executemode"`                                           // 执行方式[2:分步履约] - 1:顺序执行 2:交叉执行
+	EXECUTESIDE               int32   `json:"executeside"  xorm:"EXECUTESIDE" form:"executeside"`                                           // 执行方[2:分步履约] - 1:买方 2:卖方
+	MINQTY                    float64 `json:"minqty"  xorm:"MINQTY" form:"minqty"`                                                          // 最小执行量[2:分步履约]
+	HOLDDAYS                  int32   `json:"holddays"  xorm:"HOLDDAYS" form:"holddays"`                                                    // 合同期限[2:分步履约]
+	MODIFIERID                int64   `json:"modifierid"  xorm:"MODIFIERID" form:"modifierid"`                                              // 修改人
+	UPDATETIME                string  `json:"updatetime"  xorm:"UPDATETIME" form:"updatetime"`                                              // 更新时间
+	BUYCHARGEALGORITHM2       int32   `json:"buychargealgorithm2"  xorm:"BUYCHARGEALGORITHM2" form:"buychargealgorithm2"`                   // 回购买方手续费收取方式 1:比率  2:固定 --77:现货商城
+	BUYCHARGEALGORITHMVALUE3  float64 `json:"buychargealgorithmvalue3"  xorm:"BUYCHARGEALGORITHMVALUE3" form:"buychargealgorithmvalue3"`    // 回购买方手续费设置值(交易所部分) --77:现货商城
+	BUYCHARGEALGORITHMVALUE4  float64 `json:"buychargealgorithmvalue4"  xorm:"BUYCHARGEALGORITHMVALUE4" form:"buychargealgorithmvalue4"`    // 回购买方手续费设置值(会员部分) --77:现货商城
+	SELLCHARGEALGORITHM2      int32   `json:"sellchargealgorithm2"  xorm:"SELLCHARGEALGORITHM2" form:"sellchargealgorithm2"`                // 回购卖方手续费收取方式  1:比率  2:固定 --77:现货商城
+	SELLCHARGEALGORITHMVALUE3 float64 `json:"sellchargealgorithmvalue3"  xorm:"SELLCHARGEALGORITHMVALUE3" form:"sellchargealgorithmvalue3"` // 回购卖方手续费设置值(交易所部分) --77:现货商城
+	SELLCHARGEALGORITHMVALUE4 float64 `json:"sellchargealgorithmvalue4"  xorm:"SELLCHARGEALGORITHMVALUE4" form:"sellchargealgorithmvalue4"` // 回购卖方手续费设置值(会员部分) --77:现货商城
+}
+
+func (r *WrMarketTradeConfig) calc() {
+
+}
+
+func (r *WrMarketTradeConfig) buildSql() string {
+	var sqlId utils.SQLVal = "select * from markettradeconfig t where 1=1"
+	sqlId.AndEx("t.MARKETID", r.MARKETID, r.MARKETID > 0)
+	return sqlId.String()
+}
+
+// GetDataEx 获取市场交易参数配置
+func (r *WrMarketTradeConfig) GetDataEx() (interface{}, error) {
+	sData := make([]WrMarketTradeConfig, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, err
+}

+ 1 - 0
routers/router.go

@@ -530,6 +530,7 @@ func InitRouter() *gin.Engine {
 		wrTrade2R.GET("QueryFilterItem", wrTrade2.QueryFilterItem)
 		wrTrade2R.GET("QueryFaProductDetail", wrTrade2.QueryFaProductDetail)
 		wrTrade2R.GET("QueryWrFactorTypeInfo", wrTrade2.QueryWrFactorTypeInfo)
+		wrTrade2R.GET("QueryWrMarketTradeConfig", wrTrade2.QueryWrMarketTradeConfig)
 	}
 
 	return r