修改铁合金接口鉴权问题

controllers/ferroalloy/mine.go

@@ -32,7 +32,7 @@ func QueryMyRefer(c *gin.Context) {
 // @Summary 查询我的注册红包
 // @Produce  json
 // @Param   accountid query    int true "资金账户"
-// @Success 200 {array}  models.RegisterMoney
+// @Success 200       {array}  models.RegisterMoney
 // @Failure  500         {object} app.Response
 // @Router  /Ferroalloy/QueryMyRegisterMoney [get]
 // @Tags     铁合金
@@ -71,7 +71,7 @@ func QueryUserLevelInfo(c *gin.Context) {
 // QueryInvestorLevelGroup
 // @Summary 查询查询我推荐的好友等级
 // @Produce  json
-// @Success 200       {array}  models.RegisterMoney
+// @Success 200 {array}  models.Thjinvestorlevelgroup
 // @Failure 500 {object} app.Response
 // @Router  /Ferroalloy/QueryInvestorLevelGroup [get]
 // @Tags     铁合金

controllers/guangzuan/tradeService.go

@@ -18,8 +18,8 @@ import (
 // @Security Group
 // @Param    userid   query    int    true  "用户ID"
 // @Param    executestatus query    int false "执行状态 - 1:未生效 2:进行中 3:已结束"
-// @Param    page     query    int    false "页码"
-// @Param    pagesize query    int    false "每页条数"
+// @Param    page          query    int false "页码"
+// @Param    pagesize      query    int false "每页条数"
 // @Success  200           {array}  models.GzcjjcorderM
 // @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrder [get]
@@ -39,8 +39,8 @@ func QueryGZCJJCOrder(c *gin.Context) {
 // @Security Group
 // @Param    userid        query    int true  "用户ID"
 // @Param    orderid  query    string false "单据ID"
-// @Param    page          query    int false "页码"
-// @Param    pagesize      query    int false "每页条数"
+// @Param    page     query    int    false "页码"
+// @Param    pagesize query    int    false "每页条数"
 // @Success  200      {array}  models.GzcjjcorderdetailM
 // @Failure  500           {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrderDetail [get]

controllers/market/market.go

@@ -18,14 +18,13 @@ type QueryMarketRunReq struct {
 }
 
 // QueryMarketRun 查询市场运行信息
-// @Summary  查询市场运行信息
-// @Produce  json
-// @Security ApiKeyAuth
-// @Param    marketID query    int false "市场ID，不传返回所有"
-// @Success  200      {object} models.Marketrun
-// @Failure  500      {object} app.Response
-// @Router   /Market/QueryMarketRun [get]
-// @Tags     通用市场
+// @Summary 查询市场运行信息
+// @Produce json
+// @Param   marketID query    int false "市场ID，不传返回所有"
+// @Success 200      {object} models.Marketrun
+// @Failure 500      {object} app.Response
+// @Router  /Market/QueryMarketRun [get]
+// @Tags    通用市场
 func QueryMarketRun(c *gin.Context) {
 	appG := app.Gin{C: c}
 

controllers/qhj/qryQhj.go

@@ -16,14 +16,14 @@ import (
 
 // QueryContract
 // @Summary  查询融资明细(合同)
-// @Produce  json
+// @Produce json
 // @Security ApiKeyAuth
 // @Param    userid        query    int false "用户ID"
 // @Param    scfcontractid query    int false "scf合同id"
 // @Success  200           {array}  models.QhjContract
 // @Failure  500           {object} app.Response
 // @Router   /Qhj/QueryContract [get]
-// @Tags     大连千海金
+// @Tags    大连千海金
 func QueryContract(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	req := struct {
@@ -116,9 +116,9 @@ func QueryRSTriggerLog(c *gin.Context) {
 // @Summary  查询收货地址信息
 // @Produce  json
 // @Security ApiKeyAuth
-// @Param    userid query    int true "用户ID"
+// @Param   userid query    int true "用户ID"
 // @Success  200    {array}  models.UserReceiveInfo
-// @Failure  500    {object} app.Response
+// @Failure 500    {object} app.Response
 // @Router   /Qhj/QueryUserReceiveInfo [get]
 // @Tags     大连千海金
 func QueryUserReceiveInfo(c *gin.Context) {
@@ -306,13 +306,12 @@ func QueryCusBankSignBank(c *gin.Context) {
 }
 
 // QuerySiteColumnDetail
-// @Summary  查询资讯
+// @Summary 查询资讯
 // @Produce  json
-// @Security ApiKeyAuth
 // @Param    userid query    int true "用户ID"
-// @Success  200    {array}  models.QhjSiteColumnDetail
+// @Success 200    {array}  models.QhjSiteColumnDetail
 // @Failure  500    {object} app.Response
-// @Router   /Qhj/QuerySiteColumnDetail [get]
+// @Router  /Qhj/QuerySiteColumnDetail [get]
 // @Tags     大连千海金
 func QuerySiteColumnDetail(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}

controllers/wrTrade2/qryWrTrade.go

@@ -47,7 +47,7 @@ func QueryOrderQuote(c *gin.Context) {
 
 // QueryOrderQuoteDetail
 // @Summary  查询买卖大厅
-// @Produce  json
+// @Produce json
 // @Security    ApiKeyAuth
 // @Param    page           query    int    false "页码"
 // @Param    pagesize       query    int    false "每页条数"
@@ -61,7 +61,7 @@ func QueryOrderQuote(c *gin.Context) {
 // @Success  200            {array}  models.WrOrderQuoteDetail
 // @Failure  500            {object} app.Response
 // @Router   /WrTrade2/QueryOrderQuoteDetail [get]
-// @Tags     仓单贸易v2
+// @Tags    仓单贸易v2
 func QueryOrderQuoteDetail(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.WrOrderQuoteDetail{HasWr: -1}
@@ -319,7 +319,7 @@ func QueryWrFactorTypeInfoEx(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Param    marketid query    int false "市场id"
 // @Success  200      {array}  models.WrMarketTradeConfig
-// @Failure  500        {object} app.Response
+// @Failure 500        {object} app.Response
 // @Router   /WrTrade2/QueryWrMarketTradeConfig [get]
 // @Tags     仓单贸易v2
 func QueryWrMarketTradeConfig(c *gin.Context) {
@@ -668,8 +668,8 @@ func QueryWrUserReceiptInfo(c *gin.Context) {
 // @Summary  查询资讯
 // @Produce  json
 // @Security ApiKeyAuth
-// @Param    page       query    int false "页码"
-// @Param    pagesize   query    int false "每页条数"
+// @Param   page       query    int false "页码"
+// @Param   pagesize   query    int false "每页条数"
 // @Param    columnid query    int false "所属栏目id"
 // @Success  200      {array}  models.WrSiteColumnDetail
 // @Failure  500      {object} app.Response
@@ -683,15 +683,14 @@ func QuerySiteColumnDetail(c *gin.Context) {
 }
 
 // QuerySiteColumnConfig
-// @Summary  查询资讯栏目配置
+// @Summary 查询资讯栏目配置
 // @Produce  json
-// @Security ApiKeyAuth
 // @Param    page     query    int false "页码"
 // @Param    pagesize query    int false "每页条数"
-// @Param    columntype query    int false "栏目类型 - 1:行情资讯 10:会员服务 30:关于我们 100:核心企业栏目-百色"
-// @Success  200        {array}  models.Sitecolumnconfig
+// @Param   columntype query    int false "栏目类型 - 1:行情资讯 10:会员服务 30:关于我们 100:核心企业栏目-百色"
+// @Success 200        {array}  models.Sitecolumnconfig
 // @Failure  500      {object} app.Response
-// @Router   /WrTrade2/QuerySiteColumnConfig [get]
+// @Router  /WrTrade2/QuerySiteColumnConfig [get]
 // @Tags     仓单贸易v2
 func QuerySiteColumnConfig(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}

docs/docs.go

@@ -7617,7 +7617,7 @@ const docTemplate = `{
                         "schema": {
                             "type": "array",
                             "items": {
-                                "$ref": "#/definitions/models.RegisterMoney"
+                                "$ref": "#/definitions/models.Thjinvestorlevelgroup"
                             }
                         }
                     },
@@ -12036,11 +12036,6 @@ const docTemplate = `{
         },
         "/Market/QueryMarketRun": {
             "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
                 "produces": [
                     "application/json"
                 ],
@@ -13619,11 +13614,6 @@ const docTemplate = `{
         },
         "/Qhj/QuerySiteColumnDetail": {
             "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
                 "produces": [
                     "application/json"
                 ],
@@ -17458,11 +17448,6 @@ const docTemplate = `{
         },
         "/WrTrade2/QuerySiteColumnConfig": {
             "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
                 "produces": [
                     "application/json"
                 ],
@@ -19761,11 +19746,7 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Division"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Division"
                 }
             }
         },
@@ -21167,7 +21148,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "点价金额=(点价价格+升贴水)*点价数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "applyid": {
@@ -21751,7 +21732,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "退款(非必填)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -21791,7 +21772,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "收付款(非必填)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricemove": {
@@ -21958,11 +21939,7 @@ const docTemplate = `{
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -22559,31 +22536,31 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "diffArbitrageQty": {
-                    "description": "套利变动量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffExposoureQty": {
-                    "description": "变动量(套保敞口)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffFutuQty": {
-                    "description": "变动量(期货总量) 平安：保值净持仓量今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffHedgeQty": {
-                    "description": "套保变动量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffQty": {
-                    "description": "变动量(总敞口) 平安:净敞口今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffSpotHedgeQty": {
-                    "description": "变动量(现货应套保总量) 平安:应套保量今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffSpotQty": {
-                    "description": "变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "enumdicname": {
@@ -24198,11 +24175,7 @@ const docTemplate = `{
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/erms3.CustomerInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/erms3.CustomerInfo"
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -24537,11 +24510,7 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Division"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Division"
                 }
             }
         },
@@ -26016,7 +25985,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期末均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -26028,7 +25997,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "参考市值(期末市值)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "curqty": {
@@ -26052,7 +26021,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "参考市价(最新价)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "cycletime": {
@@ -26084,7 +26053,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "浮动损益",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -26132,7 +26101,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "今日采购均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -26152,7 +26121,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "今日销售均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -29084,7 +29053,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "折算系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "cycletime": {
@@ -29108,11 +29077,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "enddate": {
@@ -29120,7 +29089,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "matchname": {
@@ -29144,31 +29113,31 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "middlegoodspricedqty": {
-                    "description": "已定价量(套保品种 - 税前) = PricedQty * 折算系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "middlegoodspricedqty2": {
-                    "description": "已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "middlegoodspricedqty3": {
-                    "description": "已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "needhedgeratio": {
-                    "description": "套保系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedamount": {
-                    "description": "已定价额(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedamount2": {
-                    "description": "已定价额(现货-基价额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedqty": {
-                    "description": "已定价量(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "reckondate": {
@@ -29176,11 +29145,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "已关联额(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "已关联量(套保品种)(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -29188,39 +29157,39 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "todayavgfutuprice": {
-                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayavgprice": {
-                    "description": "今日定价均价 = TodayPricedAmount / TodayPricedQty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayavgprice2": {
-                    "description": "今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedamount": {
-                    "description": "今日定价额(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedamount2": {
-                    "description": "今日定价额(现货-基价额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedqty": {
-                    "description": "今日定价量(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedfutureqty": {
-                    "description": "今日关联量(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsamount": {
-                    "description": "今日关联额(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsqty": {
-                    "description": "今日关联量(套保品-期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "updatetime": {
@@ -29232,7 +29201,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "增值税率",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -29781,7 +29750,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "平仓均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -29849,7 +29818,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期末持仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -29881,7 +29850,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "开仓均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -29889,7 +29858,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初持仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -29933,7 +29902,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "今平仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -29949,7 +29918,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "今开仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "userid": {
@@ -31615,11 +31584,7 @@ const docTemplate = `{
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpRoleMenu"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpRoleMenu"
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -31925,11 +31890,7 @@ const docTemplate = `{
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpTaAccountM"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpTaAccountM"
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -44377,11 +44338,7 @@ const docTemplate = `{
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -44515,11 +44472,7 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -44816,11 +44769,7 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -45164,6 +45113,71 @@ const docTemplate = `{
                 }
             }
         },
+        "models.Thjinvestorlevelgroup": {
+            "type": "object",
+            "properties": {
+                "grouplevel": {
+                    "description": "分组级别 - 唯一",
+                    "type": "integer"
+                },
+                "groupname": {
+                    "description": "分级名称",
+                    "type": "string"
+                },
+                "keepbuyqty": {
+                    "description": "保级一级采购总量",
+                    "type": "integer"
+                },
+                "levelgroupid": {
+                    "description": "自增ID(SEQ_THJ_INVESTORLEVELGROUP)",
+                    "type": "integer"
+                },
+                "levelonealgorithm": {
+                    "description": "一级分润算法(采购) 1：比率  2：固定",
+                    "type": "integer"
+                },
+                "levelonealgorithm2": {
+                    "description": "一级分润算法(供求) 1：比率  2：固定",
+                    "type": "integer"
+                },
+                "levelonealgorithm3": {
+                    "description": "一级分润算法(转让) 1：比率  2：固定",
+                    "type": "integer"
+                },
+                "levelonevalue": {
+                    "description": "一级分润值(采购)",
+                    "type": "number"
+                },
+                "levelonevalue2": {
+                    "description": "一级分润值(供求)",
+                    "type": "number"
+                },
+                "levelonevalue3": {
+                    "description": "一级分润值(转让)",
+                    "type": "number"
+                },
+                "leveltwoalgorithm": {
+                    "description": "二级级分润算法(采购) 1：比率  2：固定",
+                    "type": "integer"
+                },
+                "leveltwovalue": {
+                    "description": "二级分润值(采购)",
+                    "type": "number"
+                },
+                "upbuyqty": {
+                    "description": "晋级一级采购总量",
+                    "type": "integer"
+                },
+                "updatetime": {
+                    "description": "平台更新时间",
+                    "type": "string"
+                },
+                "updatorid": {
+                    "description": "更新人",
+                    "type": "integer"
+                }
+            }
+        },
         "models.Thjpurchasetradedetail": {
             "type": "object",
             "required": [
@@ -46095,11 +46109,7 @@ const docTemplate = `{
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
-                        }
-                    ]
+                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -46127,7 +46137,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "委托价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "orderqty": {
@@ -46196,7 +46206,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "转让数量(数量)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradeid": {
@@ -46257,7 +46267,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "冻结数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "goodscode": {
@@ -46293,7 +46303,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "持仓数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -46317,7 +46327,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "建仓数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "optiontype": {
@@ -47399,7 +47409,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "挂牌价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -47407,7 +47417,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "履约保证金比例",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "marketid": {
@@ -47589,7 +47599,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "成交均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -47847,7 +47857,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "交割均价 = 交割金额 / 交割数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "begindate": {
@@ -47963,7 +47973,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -48843,7 +48853,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "步骤值",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "templateid": {
@@ -49154,7 +49164,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -49214,11 +49224,11 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "冻结手续费",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "冻结保证金(保证金)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -49254,7 +49264,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "保证金设置值(履约保证金)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "marketid": {
@@ -49496,7 +49506,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "起摘数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -49869,7 +49879,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "剩余款(待支付金额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "userid": {
@@ -50416,7 +50426,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "起摘数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -50553,11 +50563,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "日成交金额(当日单方向成交金额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "日成交数量(当日单方向成交数量)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -50726,7 +50736,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "未结费用",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "updatetime": {
@@ -51318,7 +51328,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "委托价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "orderqty": {
@@ -54390,11 +54400,7 @@ const docTemplate = `{
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Loginaccount"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Loginaccount"
                 },
                 "markets": {
                     "description": "市场",
@@ -54412,19 +54418,11 @@ const docTemplate = `{
                 },
                 "userAccount": {
                     "description": "用户账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Useraccount"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Useraccount"
                 },
                 "userInfo": {
                     "description": "用户信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Userinfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Userinfo"
                 },
                 "username": {
                     "description": "用户姓名",

docs/swagger.json

@@ -7608,7 +7608,7 @@
                         "schema": {
                             "type": "array",
                             "items": {
-                                "$ref": "#/definitions/models.RegisterMoney"
+                                "$ref": "#/definitions/models.Thjinvestorlevelgroup"
                             }
                         }
                     },
@@ -12027,11 +12027,6 @@
         },
         "/Market/QueryMarketRun": {
             "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
                 "produces": [
                     "application/json"
                 ],
@@ -13610,11 +13605,6 @@
         },
         "/Qhj/QuerySiteColumnDetail": {
             "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
                 "produces": [
                     "application/json"
                 ],
@@ -17449,11 +17439,6 @@
         },
         "/WrTrade2/QuerySiteColumnConfig": {
             "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
                 "produces": [
                     "application/json"
                 ],
@@ -19752,11 +19737,7 @@
                 },
                 "province": {
                     "description": "省",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Division"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Division"
                 }
             }
         },
@@ -21158,7 +21139,7 @@
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "点价金额=(点价价格+升贴水)*点价数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "applyid": {
@@ -21742,7 +21723,7 @@
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "退款(非必填)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -21782,7 +21763,7 @@
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "收付款(非必填)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricemove": {
@@ -21949,11 +21930,7 @@
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -22550,31 +22527,31 @@
                     "type": "number"
                 },
                 "diffArbitrageQty": {
-                    "description": "套利变动量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffExposoureQty": {
-                    "description": "变动量(套保敞口)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffFutuQty": {
-                    "description": "变动量(期货总量) 平安：保值净持仓量今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffHedgeQty": {
-                    "description": "套保变动量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffQty": {
-                    "description": "变动量(总敞口) 平安:净敞口今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffSpotHedgeQty": {
-                    "description": "变动量(现货应套保总量) 平安:应套保量今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffSpotQty": {
-                    "description": "变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "enumdicname": {
@@ -24189,11 +24166,7 @@
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/erms3.CustomerInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/erms3.CustomerInfo"
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -24528,11 +24501,7 @@
                 },
                 "province": {
                     "description": "省",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Division"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Division"
                 }
             }
         },
@@ -26007,7 +25976,7 @@
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期末均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -26019,7 +25988,7 @@
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "参考市值(期末市值)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "curqty": {
@@ -26043,7 +26012,7 @@
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "参考市价(最新价)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "cycletime": {
@@ -26075,7 +26044,7 @@
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "浮动损益",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -26123,7 +26092,7 @@
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "今日采购均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -26143,7 +26112,7 @@
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "今日销售均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -29075,7 +29044,7 @@
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "折算系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "cycletime": {
@@ -29099,11 +29068,11 @@
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "enddate": {
@@ -29111,7 +29080,7 @@
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "matchname": {
@@ -29135,31 +29104,31 @@
                     "type": "string"
                 },
                 "middlegoodspricedqty": {
-                    "description": "已定价量(套保品种 - 税前) = PricedQty * 折算系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "middlegoodspricedqty2": {
-                    "description": "已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "middlegoodspricedqty3": {
-                    "description": "已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "needhedgeratio": {
-                    "description": "套保系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedamount": {
-                    "description": "已定价额(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedamount2": {
-                    "description": "已定价额(现货-基价额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedqty": {
-                    "description": "已定价量(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "reckondate": {
@@ -29167,11 +29136,11 @@
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "已关联额(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "已关联量(套保品种)(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -29179,39 +29148,39 @@
                     "type": "string"
                 },
                 "todayavgfutuprice": {
-                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayavgprice": {
-                    "description": "今日定价均价 = TodayPricedAmount / TodayPricedQty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayavgprice2": {
-                    "description": "今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedamount": {
-                    "description": "今日定价额(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedamount2": {
-                    "description": "今日定价额(现货-基价额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedqty": {
-                    "description": "今日定价量(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedfutureqty": {
-                    "description": "今日关联量(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsamount": {
-                    "description": "今日关联额(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsqty": {
-                    "description": "今日关联量(套保品-期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "updatetime": {
@@ -29223,7 +29192,7 @@
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "增值税率",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -29772,7 +29741,7 @@
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "平仓均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -29840,7 +29809,7 @@
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期末持仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -29872,7 +29841,7 @@
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "开仓均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -29880,7 +29849,7 @@
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初持仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -29924,7 +29893,7 @@
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "今平仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -29940,7 +29909,7 @@
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "今开仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "userid": {
@@ -31606,11 +31575,7 @@
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpRoleMenu"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpRoleMenu"
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -31916,11 +31881,7 @@
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpTaAccountM"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpTaAccountM"
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -44368,11 +44329,7 @@
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -44506,11 +44463,7 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -44807,11 +44760,7 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -45155,6 +45104,71 @@
                 }
             }
         },
+        "models.Thjinvestorlevelgroup": {
+            "type": "object",
+            "properties": {
+                "grouplevel": {
+                    "description": "分组级别 - 唯一",
+                    "type": "integer"
+                },
+                "groupname": {
+                    "description": "分级名称",
+                    "type": "string"
+                },
+                "keepbuyqty": {
+                    "description": "保级一级采购总量",
+                    "type": "integer"
+                },
+                "levelgroupid": {
+                    "description": "自增ID(SEQ_THJ_INVESTORLEVELGROUP)",
+                    "type": "integer"
+                },
+                "levelonealgorithm": {
+                    "description": "一级分润算法(采购) 1：比率  2：固定",
+                    "type": "integer"
+                },
+                "levelonealgorithm2": {
+                    "description": "一级分润算法(供求) 1：比率  2：固定",
+                    "type": "integer"
+                },
+                "levelonealgorithm3": {
+                    "description": "一级分润算法(转让) 1：比率  2：固定",
+                    "type": "integer"
+                },
+                "levelonevalue": {
+                    "description": "一级分润值(采购)",
+                    "type": "number"
+                },
+                "levelonevalue2": {
+                    "description": "一级分润值(供求)",
+                    "type": "number"
+                },
+                "levelonevalue3": {
+                    "description": "一级分润值(转让)",
+                    "type": "number"
+                },
+                "leveltwoalgorithm": {
+                    "description": "二级级分润算法(采购) 1：比率  2：固定",
+                    "type": "integer"
+                },
+                "leveltwovalue": {
+                    "description": "二级分润值(采购)",
+                    "type": "number"
+                },
+                "upbuyqty": {
+                    "description": "晋级一级采购总量",
+                    "type": "integer"
+                },
+                "updatetime": {
+                    "description": "平台更新时间",
+                    "type": "string"
+                },
+                "updatorid": {
+                    "description": "更新人",
+                    "type": "integer"
+                }
+            }
+        },
         "models.Thjpurchasetradedetail": {
             "type": "object",
             "required": [
@@ -46086,11 +46100,7 @@
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
-                        }
-                    ]
+                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -46118,7 +46128,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "委托价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "orderqty": {
@@ -46187,7 +46197,7 @@
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "转让数量(数量)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradeid": {
@@ -46248,7 +46258,7 @@
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "冻结数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "goodscode": {
@@ -46284,7 +46294,7 @@
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "持仓数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -46308,7 +46318,7 @@
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "建仓数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "optiontype": {
@@ -47390,7 +47400,7 @@
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "挂牌价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -47398,7 +47408,7 @@
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "履约保证金比例",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "marketid": {
@@ -47580,7 +47590,7 @@
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "成交均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -47838,7 +47848,7 @@
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "交割均价 = 交割金额 / 交割数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "begindate": {
@@ -47954,7 +47964,7 @@
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -48834,7 +48844,7 @@
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "步骤值",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "templateid": {
@@ -49145,7 +49155,7 @@
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -49205,11 +49215,11 @@
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "冻结手续费",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "冻结保证金(保证金)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -49245,7 +49255,7 @@
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "保证金设置值(履约保证金)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "marketid": {
@@ -49487,7 +49497,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "起摘数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -49860,7 +49870,7 @@
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "剩余款(待支付金额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "userid": {
@@ -50407,7 +50417,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "起摘数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -50544,11 +50554,11 @@
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "日成交金额(当日单方向成交金额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "日成交数量(当日单方向成交数量)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -50717,7 +50727,7 @@
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "未结费用",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "updatetime": {
@@ -51309,7 +51319,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "委托价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "orderqty": {
@@ -54381,11 +54391,7 @@
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Loginaccount"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Loginaccount"
                 },
                 "markets": {
                     "description": "市场",
@@ -54403,19 +54409,11 @@
                 },
                 "userAccount": {
                     "description": "用户账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Useraccount"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Useraccount"
                 },
                 "userInfo": {
                     "description": "用户信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Userinfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Userinfo"
                 },
                 "username": {
                     "description": "用户姓名",

docs/swagger.yaml

@@ -226,8 +226,7 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        allOf:
-        - $ref: '#/definitions/models.Division'
+        $ref: '#/definitions/models.Division'
         description: 省
     type: object
   common.QueryTableDefineRsp:
@@ -1275,7 +1274,7 @@ definitions:
   ermcp.QryBusinessDjRsp:
     properties:
       amount:
-        description: 点价金额=(点价价格+升贴水)*点价数量
+        description: 期初均价
         type: number
       applyid:
         description: 申请人
@@ -1710,7 +1709,7 @@ definitions:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
       deductamount:
-        description: 退款(非必填)
+        description: 期初均价
         type: number
       deliverygoodscode:
         description: 现货品种代码
@@ -1740,7 +1739,7 @@ definitions:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
       payamount:
-        description: 收付款(非必填)
+        description: 期初均价
         type: number
       pricemove:
         description: 升贴水
@@ -1862,8 +1861,7 @@ definitions:
           $ref: '#/definitions/models.ErmcpGGConvertCfg'
         type: array
       mg:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
+        $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
         description: 套保品种基本信息
       wrcList:
         description: 现货品种列表(现货商品折算配置)
@@ -2308,25 +2306,25 @@ definitions:
         description: 套利量
         type: number
       diffArbitrageQty:
-        description: 套利变动量
+        description: 期初均价
         type: number
       diffExposoureQty:
-        description: 变动量(套保敞口)
+        description: 期初均价
         type: number
       diffFutuQty:
-        description: 变动量(期货总量) 平安：保值净持仓量今日变动
+        description: 期初均价
         type: number
       diffHedgeQty:
-        description: 套保变动量
+        description: 期初均价
         type: number
       diffQty:
-        description: 变动量(总敞口) 平安:净敞口今日变动
+        description: 期初均价
         type: number
       diffSpotHedgeQty:
-        description: 变动量(现货应套保总量) 平安:应套保量今日变动
+        description: 期初均价
         type: number
       diffSpotQty:
-        description: 变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动
+        description: 期初均价
         type: number
       enumdicname:
         description: 单位名称
@@ -3528,8 +3526,7 @@ definitions:
           $ref: '#/definitions/erms3.CustomerInfo'
         type: array
       ouruser:
-        allOf:
-        - $ref: '#/definitions/erms3.CustomerInfo'
+        $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
       warehouseinfos:
         description: 仓库信息列表
@@ -3774,8 +3771,7 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        allOf:
-        - $ref: '#/definitions/models.Division'
+        $ref: '#/definitions/models.Division'
         description: 省
     type: object
   models.Arearole:
@@ -4868,7 +4864,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期末均价
+        description: 期初均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -4877,7 +4873,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 参考市值(期末市值)
+        description: 期初均价
         type: number
       curqty:
         description: 期末量
@@ -4895,7 +4891,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 参考市价(最新价)
+        description: 期初均价
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -4919,7 +4915,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 浮动损益
+        description: 期初均价
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -4955,7 +4951,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 今日采购均价
+        description: 期初均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -4970,7 +4966,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 今日销售均价
+        description: 期初均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -7150,7 +7146,7 @@ definitions:
         description: 合同类型 1：采购 -1：销售
         type: integer
       convertratio:
-        description: 折算系数
+        description: 期初均价
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -7168,16 +7164,16 @@ definitions:
         description: 品种名称
         type: string
       diffprice:
-        description: 现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价
+        description: 期初均价
         type: number
       diffqty:
-        description: 期现数量差 = 套保计划量 - 今日期货关联成交量
+        description: 期初均价
         type: number
       enddate:
         description: 结束交易日
         type: string
       hedgeplanqty:
-        description: 套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例
+        description: 期初均价
         type: number
       matchname:
         description: 交易对手方(个人:用户名称 企业:简称)
@@ -7195,64 +7191,64 @@ definitions:
         description: 套保品种名称
         type: string
       middlegoodspricedqty:
-        description: 已定价量(套保品种 - 税前) = PricedQty * 折算系数
+        description: 期初均价
         type: number
       middlegoodspricedqty2:
-        description: 已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))
+        description: 期初均价
         type: number
       middlegoodspricedqty3:
-        description: 已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率
+        description: 期初均价
         type: number
       needhedgeratio:
-        description: 套保系数
+        description: 期初均价
         type: number
       pricedamount:
-        description: 已定价额(现货)
+        description: 期初均价
         type: number
       pricedamount2:
-        description: 已定价额(现货-基价额)
+        description: 期初均价
         type: number
       pricedqty:
-        description: 已定价量(现货)
+        description: 期初均价
         type: number
       reckondate:
         description: 日照时期(yyyyMMdd)
         type: string
       relatedmiddlegoodsamount:
-        description: 已关联额(期货)
+        description: 期初均价
         type: number
       relatedmiddlegoodsqty:
-        description: 已关联量(套保品种)(期货)
+        description: 期初均价
         type: number
       spotcontractid:
         description: 现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
         type: string
       todayavgfutuprice:
-        description: 今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty
+        description: 期初均价
         type: number
       todayavgprice:
-        description: 今日定价均价 = TodayPricedAmount / TodayPricedQty
+        description: 期初均价
         type: number
       todayavgprice2:
-        description: 今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty
+        description: 期初均价
         type: number
       todaypricedamount:
-        description: 今日定价额(现货)
+        description: 期初均价
         type: number
       todaypricedamount2:
-        description: 今日定价额(现货-基价额)
+        description: 期初均价
         type: number
       todaypricedqty:
-        description: 今日定价量(现货)
+        description: 期初均价
         type: number
       todayrelatedfutureqty:
-        description: 今日关联量(期货)
+        description: 期初均价
         type: number
       todayrelatedmiddlegoodsamount:
-        description: 今日关联额(期货)
+        description: 期初均价
         type: number
       todayrelatedmiddlegoodsqty:
-        description: 今日关联量(套保品-期货)
+        description: 期初均价
         type: number
       updatetime:
         description: 更新时间
@@ -7261,7 +7257,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 增值税率
+        description: 期初均价
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -7669,7 +7665,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 平仓均价
+        description: 期初均价
         type: number
       closepl:
         description: 平仓损益
@@ -7720,7 +7716,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期末持仓量
+        description: 期初均价
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -7744,13 +7740,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 开仓均价
+        description: 期初均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初持仓量
+        description: 期初均价
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -7783,7 +7779,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 今平仓量
+        description: 期初均价
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=（期末持仓量 - 期初持仓量）* 合约乘数)
@@ -7795,7 +7791,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 今开仓量
+        description: 期初均价
         type: number
       userid:
         description: 账户所属用户ID
@@ -9027,8 +9023,7 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpRoleMenu'
+        $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -9255,8 +9250,7 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpTaAccountM'
+        $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -18498,8 +18492,7 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -18656,8 +18649,7 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -18836,8 +18828,7 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -19068,6 +19059,54 @@ definitions:
     required:
     - autoid
     type: object
+  models.Thjinvestorlevelgroup:
+    properties:
+      grouplevel:
+        description: 分组级别 - 唯一
+        type: integer
+      groupname:
+        description: 分级名称
+        type: string
+      keepbuyqty:
+        description: 保级一级采购总量
+        type: integer
+      levelgroupid:
+        description: 自增ID(SEQ_THJ_INVESTORLEVELGROUP)
+        type: integer
+      levelonealgorithm:
+        description: 一级分润算法(采购) 1：比率  2：固定
+        type: integer
+      levelonealgorithm2:
+        description: 一级分润算法(供求) 1：比率  2：固定
+        type: integer
+      levelonealgorithm3:
+        description: 一级分润算法(转让) 1：比率  2：固定
+        type: integer
+      levelonevalue:
+        description: 一级分润值(采购)
+        type: number
+      levelonevalue2:
+        description: 一级分润值(供求)
+        type: number
+      levelonevalue3:
+        description: 一级分润值(转让)
+        type: number
+      leveltwoalgorithm:
+        description: 二级级分润算法(采购) 1：比率  2：固定
+        type: integer
+      leveltwovalue:
+        description: 二级分润值(采购)
+        type: number
+      upbuyqty:
+        description: 晋级一级采购总量
+        type: integer
+      updatetime:
+        description: 平台更新时间
+        type: string
+      updatorid:
+        description: 更新人
+        type: integer
+    type: object
   models.Thjpurchasetradedetail:
     properties:
       buyaccountid:
@@ -19764,8 +19803,7 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        allOf:
-        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -19786,7 +19824,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 委托价格
+        description: 期初均价
         type: number
       orderqty:
         description: 委托数量
@@ -19837,7 +19875,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 转让数量(数量)
+        description: 期初均价
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -19882,7 +19920,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 冻结数量
+        description: 期初均价
         type: number
       goodscode:
         description: 商品代码
@@ -19909,7 +19947,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 持仓数量
+        description: 期初均价
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -19927,7 +19965,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 建仓数量
+        description: 期初均价
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -20734,13 +20772,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 挂牌价格
+        description: 期初均价
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 履约保证金比例
+        description: 期初均价
         type: number
       marketid:
         description: 市场ID
@@ -20875,7 +20913,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 成交均价
+        description: 期初均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -21063,7 +21101,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 交割均价 = 交割金额 / 交割数量
+        description: 期初均价
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -21150,7 +21188,7 @@ definitions:
         description: 合约数量
         type: number
       xgoodsamount:
-        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
+        description: 期初均价
         type: number
       xgoodscode:
         description: 商品代码
@@ -21803,7 +21841,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 步骤值
+        description: 期初均价
         type: number
       templateid:
         description: 履约计划模板ID
@@ -22038,7 +22076,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 挂牌金额 = 委托数量 * 固定价或升贴水
+        description: 期初均价
         type: number
       bannerpicurl:
         description: Banner图
@@ -22083,10 +22121,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 冻结手续费
+        description: 期初均价
         type: number
       freezemargin:
-        description: 冻结保证金(保证金)
+        description: 期初均价
         type: number
       futupricemove:
         description: 期货升贴水
@@ -22113,7 +22151,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 保证金设置值(履约保证金)
+        description: 期初均价
         type: number
       marketid:
         description: 市场ID
@@ -22294,7 +22332,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 起摘数量
+        description: 期初均价
         type: number
       deliverymonth:
         description: 交收月
@@ -22574,7 +22612,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 剩余款(待支付金额)
+        description: 期初均价
         type: number
       userid:
         description: 用户id
@@ -22986,7 +23024,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 起摘数量
+        description: 期初均价
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -23088,10 +23126,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 日成交金额(当日单方向成交金额)
+        description: 期初均价
         type: number
       tradeqty:
-        description: 日成交数量(当日单方向成交数量)
+        description: 期初均价
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -23218,7 +23256,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 未结费用
+        description: 期初均价
         type: number
       updatetime:
         description: 更新时间
@@ -23654,7 +23692,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 委托价格
+        description: 期初均价
         type: number
       orderqty:
         description: 委托数量
@@ -25981,8 +26019,7 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        allOf:
-        - $ref: '#/definitions/models.Loginaccount'
+        $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -25995,12 +26032,10 @@ definitions:
           $ref: '#/definitions/models.Systemparam'
         type: array
       userAccount:
-        allOf:
-        - $ref: '#/definitions/models.Useraccount'
+        $ref: '#/definitions/models.Useraccount'
         description: 用户账号
       userInfo:
-        allOf:
-        - $ref: '#/definitions/models.Userinfo'
+        $ref: '#/definitions/models.Userinfo'
         description: 用户信息
       username:
         description: 用户姓名
@@ -30840,7 +30875,7 @@ paths:
           description: OK
           schema:
             items:
-              $ref: '#/definitions/models.RegisterMoney'
+              $ref: '#/definitions/models.Thjinvestorlevelgroup'
             type: array
         "500":
           description: Internal Server Error
@@ -33604,8 +33639,6 @@ paths:
           description: Internal Server Error
           schema:
             $ref: '#/definitions/app.Response'
-      security:
-      - ApiKeyAuth: []
       summary: 查询市场运行信息
       tags:
       - 通用市场
@@ -34599,8 +34632,6 @@ paths:
           description: Internal Server Error
           schema:
             $ref: '#/definitions/app.Response'
-      security:
-      - ApiKeyAuth: []
       summary: 查询资讯
       tags:
       - 大连千海金
@@ -37047,8 +37078,6 @@ paths:
           description: Internal Server Error
           schema:
             $ref: '#/definitions/app.Response'
-      security:
-      - ApiKeyAuth: []
       summary: 查询资讯栏目配置
       tags:
       - 仓单贸易v2

routers/router.go

@@ -154,16 +154,16 @@ func InitRouter() *gin.Engine {
 	}
 	// ************************ 通用市场 ************************
 	marketR := apiR.Group("Market")
-	marketR.Use(token.Auth())
+	marketR.Use()
 	{
 		// 查询市场运行信息
 		marketR.GET("/QueryMarketRun", market.QueryMarketRun)
 		// 获取登录账号有权限的市场信息
-		marketR.GET("/QueryMarketsByLoginID", market.QueryMarketsByLoginID)
+		marketR.Use(token.Auth()).GET("/QueryMarketsByLoginID", market.QueryMarketsByLoginID)
 		// 获取登录账号有权限的商品信息
-		marketR.GET("/QueryGoodsesByLoginID", market.QueryGoodsesByLoginID)
+		marketR.Use(token.Auth()).GET("/QueryGoodsesByLoginID", market.QueryGoodsesByLoginID)
 		// 获取所有外部交易所信息
-		marketR.GET("/GetAllExExchanges", market.GetAllExExchanges)
+		marketR.Use(token.Auth()).GET("/GetAllExExchanges", market.GetAllExExchanges)
 	}
 	// ************************ 通用单据 ************************
 	orderR := apiR.Group("Order")
@@ -524,34 +524,34 @@ func InitRouter() *gin.Engine {
 
 	// ****************************大连千海金******************************
 	qhjR := apiR.Group("Qhj")
-	qhjR.Use(token.Auth())
+	qhjR.Use()
 	{
-		qhjR.GET("QueryContract", qhj.QueryContract)
-		qhjR.GET("QueryContractLog", qhj.QueryContractLog)
-		qhjR.GET("QueryRStrategy", qhj.QueryRStrategy)
-		qhjR.GET("QueryRSTriggerLog", qhj.QueryRSTriggerLog)
-		qhjR.GET("QueryUserReceiveInfo", qhj.QueryUserReceiveInfo)
-		qhjR.GET("QueryUserCollectConfig", qhj.QueryUserCollectConfig)
-		qhjR.GET("QueryTradeGoodsPickup", qhj.QueryTradeGoodsPickup)
-		qhjR.GET("QueryBankAccountSign", qhj.QueryBankAccountSign)
-		qhjR.GET("QueryPickGoods", qhj.QueryPickGoods)
-		qhjR.GET("QueryPickArea", qhj.QueryPickArea)
-		qhjR.GET("QueryBankInfo", qhj.QueryBankInfo)
-		qhjR.GET("QueryReckonPriceLog", qhj.QueryReckonPriceLog)
-		qhjR.GET("QueryCustomerInfo", qhj.QueryCustomerInfo)
-		qhjR.GET("QueryCusBankSignBank", qhj.QueryCusBankSignBank)
 		qhjR.GET("QuerySiteColumnDetail", qhj.QuerySiteColumnDetail)
-		qhjR.GET("QueryAccountInOutApply", qhj.QueryAccountInOutApply)
-		qhjR.GET("QueryPayOrder", qhj.QueryPayOrder)
-		qhjR.GET("QueryGoodsEx", qhj.QueryGoodsEx)
-		qhjR.GET("QueryParentAreaList", qhj.QueryParentAreaList)
-		qhjR.GET("QueryAreaFinanceConfig", qhj.QueryAreaFinanceConfig)
-		qhjR.GET("QueryMyTeam", qhj.QueryMyTeam)
-		qhjR.GET("QueryMyTeamOrder", qhj.QueryTeamOrder)
-		qhjR.GET("QueryBrokerRewardLog", qhj.QueryBrokerRewardLog)
-		qhjR.GET("QueryScoreLog", qhj.QueryScoreLog)
-		qhjR.GET("QueryBrokerApply", qhj.QueryBrokerApply)
-		qhjR.GET("QueryBrokerApplyEx", qhj.QueryBrokerApplyEx)
+		qhjR.Use(token.Auth()).GET("QueryContract", qhj.QueryContract)
+		qhjR.Use(token.Auth()).GET("QueryContractLog", qhj.QueryContractLog)
+		qhjR.Use(token.Auth()).GET("QueryRStrategy", qhj.QueryRStrategy)
+		qhjR.Use(token.Auth()).GET("QueryRSTriggerLog", qhj.QueryRSTriggerLog)
+		qhjR.Use(token.Auth()).GET("QueryUserReceiveInfo", qhj.QueryUserReceiveInfo)
+		qhjR.Use(token.Auth()).GET("QueryUserCollectConfig", qhj.QueryUserCollectConfig)
+		qhjR.Use(token.Auth()).GET("QueryTradeGoodsPickup", qhj.QueryTradeGoodsPickup)
+		qhjR.Use(token.Auth()).GET("QueryBankAccountSign", qhj.QueryBankAccountSign)
+		qhjR.Use(token.Auth()).GET("QueryPickGoods", qhj.QueryPickGoods)
+		qhjR.Use(token.Auth()).GET("QueryPickArea", qhj.QueryPickArea)
+		qhjR.Use(token.Auth()).GET("QueryBankInfo", qhj.QueryBankInfo)
+		qhjR.Use(token.Auth()).GET("QueryReckonPriceLog", qhj.QueryReckonPriceLog)
+		qhjR.Use(token.Auth()).GET("QueryCustomerInfo", qhj.QueryCustomerInfo)
+		qhjR.Use(token.Auth()).GET("QueryCusBankSignBank", qhj.QueryCusBankSignBank)
+		qhjR.Use(token.Auth()).GET("QueryAccountInOutApply", qhj.QueryAccountInOutApply)
+		qhjR.Use(token.Auth()).GET("QueryPayOrder", qhj.QueryPayOrder)
+		qhjR.Use(token.Auth()).GET("QueryGoodsEx", qhj.QueryGoodsEx)
+		qhjR.Use(token.Auth()).GET("QueryParentAreaList", qhj.QueryParentAreaList)
+		qhjR.Use(token.Auth()).GET("QueryAreaFinanceConfig", qhj.QueryAreaFinanceConfig)
+		qhjR.Use(token.Auth()).GET("QueryMyTeam", qhj.QueryMyTeam)
+		qhjR.Use(token.Auth()).GET("QueryMyTeamOrder", qhj.QueryTeamOrder)
+		qhjR.Use(token.Auth()).GET("QueryBrokerRewardLog", qhj.QueryBrokerRewardLog)
+		qhjR.Use(token.Auth()).GET("QueryScoreLog", qhj.QueryScoreLog)
+		qhjR.Use(token.Auth()).GET("QueryBrokerApply", qhj.QueryBrokerApply)
+		qhjR.Use(token.Auth()).GET("QueryBrokerApplyEx", qhj.QueryBrokerApplyEx)
 	}
 
 	// *************************千海金(PCWeb)*****************************
@@ -584,56 +584,56 @@ func InitRouter() *gin.Engine {
 
 	// **************************仓单贸易v2(仓单优化)********************
 	wrTrade2R := apiR.Group("WrTrade2")
-	wrTrade2R.Use(token.Auth())
+	wrTrade2R.Use()
 	{
-		wrTrade2R.GET("QueryOrderQuote", wrTrade2.QueryOrderQuote)
-		wrTrade2R.GET("QueryOrderQuoteDetail", wrTrade2.QueryOrderQuoteDetail)
-		wrTrade2R.GET("QueryWrPosition", wrTrade2.QueryWrPosition)
-		wrTrade2R.GET("QueryWrOrderDetail", wrTrade2.QueryWrOrderDetail)
-		wrTrade2R.GET("QueryWrTradeDetail", wrTrade2.QueryWrTradeDetail)
-		wrTrade2R.GET("QueryWrSpecialMatchOrder", wrTrade2.QueryWrSpecialMatchOrder)
-		wrTrade2R.GET("QueryWrGoodsInfo", wrTrade2.QueryWrGoodsInfo)
-		wrTrade2R.GET("QueryPerformancePlan", wrTrade2.QueryPerformancePlan)
-		wrTrade2R.GET("QueryHoldLB", wrTrade2.QueryHoldLB)
-		wrTrade2R.GET("QueryFilterItem", wrTrade2.QueryFilterItem)
-		wrTrade2R.GET("QueryFaProductDetail", wrTrade2.QueryFaProductDetail)
-		wrTrade2R.GET("QueryWrFactorTypeInfo", wrTrade2.QueryWrFactorTypeInfo)
-		wrTrade2R.GET("QueryWrFactorTypeInfoEx", wrTrade2.QueryWrFactorTypeInfoEx)
-		wrTrade2R.GET("QueryWrMarketTradeConfig", wrTrade2.QueryWrMarketTradeConfig)
-		wrTrade2R.GET("QueryFtDeliveryGoods", wrTrade2.QueryFtDeliveryGoods)
-		wrTrade2R.GET("QueryWrStandardFactoryItem", wrTrade2.QueryWrStandardFactoryItem)
-		wrTrade2R.GET("QueryWrPerformancePlanStep", wrTrade2.QueryWrPerformancePlanStep)
-		wrTrade2R.GET("QueryWrFinanceBuyApply", wrTrade2.QueryWrFinanceBuyApply)
-		wrTrade2R.GET("QueryWrScfContract", wrTrade2.QueryWrScfContract)
-		wrTrade2R.GET("QueryWrBuybackDetail", wrTrade2.QueryWrBuybackDetail)
-		wrTrade2R.GET("QueryWrScfContractInterest", wrTrade2.QueryWrScfContractInterest)
-		wrTrade2R.GET("QueryWrOutInApply", wrTrade2.QueryWrOutInApply)
-		wrTrade2R.GET("QueryWrDeliveryDetail", wrTrade2.QueryWrDeliveryDetail)
-		wrTrade2R.GET("QueryWrBsGoodsInfo", wrTrade2.QueryWrBsGoodsInfo)
-		wrTrade2R.GET("QueryWrTradeOrderDetail", wrTrade2.QueryWrTradeOrderDetail)
-		wrTrade2R.GET("QueryWrAverageTradePrice", wrTrade2.QueryWrAverageTradePrice)
-		wrTrade2R.GET("QueryOrderQuoteMyq", wrTrade2.QueryOrderQuoteMyq)
-		wrTrade2R.GET("QueryWrDeliveryAvalidHoldLB", wrTrade2.QueryWrDeliveryAvalidHoldLB)
-		wrTrade2R.GET("QueryWrUserFriend", wrTrade2.QueryWrUserFriend)
-		wrTrade2R.GET("QueryWrFriendApply", wrTrade2.QueryWrFriendApply)
-		wrTrade2R.GET("QueryPermancePlanTmp", wrTrade2.QueryPermancePlanTmp)
-		wrTrade2R.GET("QueryWrTradeBargainApply", wrTrade2.QueryWrTradeBargainApply)
-		wrTrade2R.GET("QueryWrPerformanceStepType", wrTrade2.QueryWrPerformanceStepType)
-		wrTrade2R.GET("QueryWrUserReceiptInfo", wrTrade2.QueryWrUserReceiptInfo)
-		wrTrade2R.GET("QuerySiteColumnDetail", wrTrade2.QuerySiteColumnDetail)
 		wrTrade2R.GET("QuerySiteColumnConfig", wrTrade2.QuerySiteColumnConfig)
-		wrTrade2R.GET("QueryDeliveryGoodsSection", wrTrade2.QueryDeliveryGoodsSection)
-		wrTrade2R.GET("QuerySpotGroupTradeSum", wrTrade2.QuerySpotGroupTradeSum)
-		wrTrade2R.GET("QuerySpotGroupTradeSumDetail", wrTrade2.QuerySpotGroupTradeSumDetail)
-		wrTrade2R.GET("QueryWrPreSaleInfo", wrTrade2.QueryWrPreSaleInfo)
-		wrTrade2R.GET("QueryWrReckonSpotGoodsTradeSum", wrTrade2.QueryWrReckonSpotGoodsTradeSum)
-		wrTrade2R.GET("QueryWrSearchUser", wrTrade2.QueryWrSearchUser)
-		wrTrade2R.GET("QueryWrDraftUserInfo", wrTrade2.QueryWrDraftUserInfo)
-		wrTrade2R.GET("QueryWrBrandAndYears", wrTrade2.QueryWrBrandAndYears)
-		wrTrade2R.GET("QueryWrClientAdSpaceConfig", wrTrade2.QueryWrClientAdSpaceConfig)
-		wrTrade2R.GET("QueryXhcpSellBackApply", wrTrade2.QueryXhcpSellBackApply)
-		wrTrade2R.POST("InsertXhcpSellBackApply", wrTrade2.InsertXhcpSellBackApply)
-		wrTrade2R.GET("QueryWrTradeQuote", wrTrade2.QueryWrTradeQuote)
+		wrTrade2R.Use(token.Auth()).GET("QueryOrderQuote", wrTrade2.QueryOrderQuote)
+		wrTrade2R.Use(token.Auth()).GET("QueryOrderQuoteDetail", wrTrade2.QueryOrderQuoteDetail)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrPosition", wrTrade2.QueryWrPosition)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrOrderDetail", wrTrade2.QueryWrOrderDetail)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrTradeDetail", wrTrade2.QueryWrTradeDetail)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrSpecialMatchOrder", wrTrade2.QueryWrSpecialMatchOrder)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrGoodsInfo", wrTrade2.QueryWrGoodsInfo)
+		wrTrade2R.Use(token.Auth()).GET("QueryPerformancePlan", wrTrade2.QueryPerformancePlan)
+		wrTrade2R.Use(token.Auth()).GET("QueryHoldLB", wrTrade2.QueryHoldLB)
+		wrTrade2R.Use(token.Auth()).GET("QueryFilterItem", wrTrade2.QueryFilterItem)
+		wrTrade2R.Use(token.Auth()).GET("QueryFaProductDetail", wrTrade2.QueryFaProductDetail)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrFactorTypeInfo", wrTrade2.QueryWrFactorTypeInfo)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrFactorTypeInfoEx", wrTrade2.QueryWrFactorTypeInfoEx)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrMarketTradeConfig", wrTrade2.QueryWrMarketTradeConfig)
+		wrTrade2R.Use(token.Auth()).GET("QueryFtDeliveryGoods", wrTrade2.QueryFtDeliveryGoods)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrStandardFactoryItem", wrTrade2.QueryWrStandardFactoryItem)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrPerformancePlanStep", wrTrade2.QueryWrPerformancePlanStep)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrFinanceBuyApply", wrTrade2.QueryWrFinanceBuyApply)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrScfContract", wrTrade2.QueryWrScfContract)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrBuybackDetail", wrTrade2.QueryWrBuybackDetail)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrScfContractInterest", wrTrade2.QueryWrScfContractInterest)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrOutInApply", wrTrade2.QueryWrOutInApply)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrDeliveryDetail", wrTrade2.QueryWrDeliveryDetail)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrBsGoodsInfo", wrTrade2.QueryWrBsGoodsInfo)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrTradeOrderDetail", wrTrade2.QueryWrTradeOrderDetail)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrAverageTradePrice", wrTrade2.QueryWrAverageTradePrice)
+		wrTrade2R.Use(token.Auth()).GET("QueryOrderQuoteMyq", wrTrade2.QueryOrderQuoteMyq)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrDeliveryAvalidHoldLB", wrTrade2.QueryWrDeliveryAvalidHoldLB)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrUserFriend", wrTrade2.QueryWrUserFriend)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrFriendApply", wrTrade2.QueryWrFriendApply)
+		wrTrade2R.Use(token.Auth()).GET("QueryPermancePlanTmp", wrTrade2.QueryPermancePlanTmp)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrTradeBargainApply", wrTrade2.QueryWrTradeBargainApply)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrPerformanceStepType", wrTrade2.QueryWrPerformanceStepType)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrUserReceiptInfo", wrTrade2.QueryWrUserReceiptInfo)
+		wrTrade2R.Use(token.Auth()).GET("QuerySiteColumnDetail", wrTrade2.QuerySiteColumnDetail)
+		wrTrade2R.Use(token.Auth()).GET("QueryDeliveryGoodsSection", wrTrade2.QueryDeliveryGoodsSection)
+		wrTrade2R.Use(token.Auth()).GET("QuerySpotGroupTradeSum", wrTrade2.QuerySpotGroupTradeSum)
+		wrTrade2R.Use(token.Auth()).GET("QuerySpotGroupTradeSumDetail", wrTrade2.QuerySpotGroupTradeSumDetail)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrPreSaleInfo", wrTrade2.QueryWrPreSaleInfo)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrReckonSpotGoodsTradeSum", wrTrade2.QueryWrReckonSpotGoodsTradeSum)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrSearchUser", wrTrade2.QueryWrSearchUser)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrDraftUserInfo", wrTrade2.QueryWrDraftUserInfo)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrBrandAndYears", wrTrade2.QueryWrBrandAndYears)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrClientAdSpaceConfig", wrTrade2.QueryWrClientAdSpaceConfig)
+		wrTrade2R.Use(token.Auth()).GET("QueryXhcpSellBackApply", wrTrade2.QueryXhcpSellBackApply)
+		wrTrade2R.Use(token.Auth()).POST("InsertXhcpSellBackApply", wrTrade2.InsertXhcpSellBackApply)
+		wrTrade2R.Use(token.Auth()).GET("QueryWrTradeQuote", wrTrade2.QueryWrTradeQuote)
 	}
 
 	// **************************天津麦顿*************************
@@ -695,6 +695,7 @@ func InitRouter() *gin.Engine {
 	ferroalloyR.Use()
 	{
 		ferroalloyR.Use().GET("QueryMyRegisterMoney", ferroalloy.QueryMyRegisterMoney)
+		ferroalloyR.Use().GET("QueryThjSpotQuoteConfig", ferroalloy.QueryThjSpotQuoteConfig)
 		ferroalloyR.Use(token.Auth()).GET("GetSpotGoodsPrice", ferroalloy.GetSpotGoodsPrice)
 		ferroalloyR.Use(token.Auth()).POST("Signin", ferroalloy.Signin)
 		ferroalloyR.Use(token.Auth()).GET("QueryMyRefer", ferroalloy.QueryMyRefer)
@@ -715,7 +716,6 @@ func InitRouter() *gin.Engine {
 		ferroalloyR.Use(token.Auth()).GET("QueryTHJPurchaseTransferOrderDetail", ferroalloy.QueryTHJPurchaseTransferOrderDetail)
 		ferroalloyR.Use(token.Auth()).GET("QueryUserLevelInfo", ferroalloy.QueryUserLevelInfo)
 		ferroalloyR.Use(token.Auth()).GET("QuerySpotgoodsPrice", ferroalloy.QuerySpotgoodsPrice)
-		ferroalloyR.Use(token.Auth()).GET("QueryThjSpotQuoteConfig", ferroalloy.QueryThjSpotQuoteConfig)
 		ferroalloyR.Use(token.Auth()).GET("QueryInvestorLevelGroup", ferroalloy.QueryInvestorLevelGroup)
 		ferroalloyR.Use(token.Auth()).GET("QueryTHJFriends", ferroalloy.QueryTHJFriends)
 		ferroalloyR.Use(token.Auth()).GET("QueryTHJProfits", ferroalloy.QueryTHJProfits)