Explorar o código

#7272 【Go查询】接口:api/Ermcp/GetErmcpGoods返回添加止盈止损相关字段

deng.yinping hai 3 semanas
pai
achega
34f9972871
Modificáronse 4 ficheiros con 639 adicións e 387 borrados
  1. 225 129
      docs/docs.go
  2. 225 128
      docs/swagger.json
  3. 171 121
      docs/swagger.yaml
  4. 18 9
      models/ermcpGoods.go

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 225 - 129
docs/docs.go


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 225 - 128
docs/swagger.json


+ 171 - 121
docs/swagger.yaml

@@ -333,7 +333,8 @@ definitions:
         description: 合同编号(此处可传已完成签署的合同编号,实现追加签章的场景)
         type: string
       fillData:
-        $ref: '#/definitions/asign.APIFillData'
+        allOf:
+        - $ref: '#/definitions/asign.APIFillData'
         description: 单行文本、多行文本、日期、身份证类型参数填充。
       tableDatas:
         description: 表格填充数据
@@ -363,10 +364,12 @@ definitions:
   asign.BankCard4Req:
     properties:
       company:
-        $ref: '#/definitions/asign.CompanyBankCard4'
+        allOf:
+        - $ref: '#/definitions/asign.CompanyBankCard4'
         description: 企业法人银行卡四要素,实体类型为企业时必填
       person:
-        $ref: '#/definitions/asign.PersonBankCard4'
+        allOf:
+        - $ref: '#/definitions/asign.PersonBankCard4'
         description: 个人银行卡四要素,实体类型为个人时必填
       type:
         description: 实体类型 1:个人 2:企业
@@ -732,7 +735,8 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        $ref: '#/definitions/models.Division'
+        allOf:
+        - $ref: '#/definitions/models.Division'
         description: 省
     type: object
   common.QueryTableDefineRsp:
@@ -1780,7 +1784,7 @@ definitions:
   ermcp.QryBusinessDjRsp:
     properties:
       amount:
-        description: 期初均价
+        description: 点价金额=(点价价格+升贴水)*点价数量
         type: number
       applyid:
         description: 申请人
@@ -2215,7 +2219,7 @@ definitions:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
       deductamount:
-        description: 期初均价
+        description: 退款(非必填)
         type: number
       deliverygoodscode:
         description: 现货品种代码
@@ -2245,7 +2249,7 @@ definitions:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
       payamount:
-        description: 期初均价
+        description: 收付款(非必填)
         type: number
       pricemove:
         description: 升贴水
@@ -2367,7 +2371,8 @@ definitions:
           $ref: '#/definitions/models.ErmcpGGConvertCfg'
         type: array
       mg:
-        $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
         description: 套保品种基本信息
       wrcList:
         description: 现货品种列表(现货商品折算配置)
@@ -2812,25 +2817,32 @@ definitions:
         description: 套利量
         type: number
       diffArbitrageQty:
-        description: 期初均价
+        description: 套利变动量
+        format: float64
         type: number
       diffExposoureQty:
-        description: 期初均价
+        description: 变动量(套保敞口)
+        format: float64
         type: number
       diffFutuQty:
-        description: 期初均价
+        description: 变动量(期货总量) 平安:保值净持仓量今日变动
+        format: float64
         type: number
       diffHedgeQty:
-        description: 期初均价
+        description: 套保变动量
+        format: float64
         type: number
       diffQty:
-        description: 期初均价
+        description: 变动量(总敞口) 平安:净敞口今日变动
+        format: float64
         type: number
       diffSpotHedgeQty:
-        description: 期初均价
+        description: 变动量(现货应套保总量) 平安:应套保量今日变动
+        format: float64
         type: number
       diffSpotQty:
-        description: 期初均价
+        description: 变动量(现货总量) = 现货数量 - 期初现货数量 平安:采销定价净值今日变动
+        format: float64
         type: number
       enumdicname:
         description: 单位名称
@@ -4032,7 +4044,8 @@ definitions:
           $ref: '#/definitions/erms3.CustomerInfo'
         type: array
       ouruser:
-        $ref: '#/definitions/erms3.CustomerInfo'
+        allOf:
+        - $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
       warehouseinfos:
         description: 仓库信息列表
@@ -4277,7 +4290,8 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        $ref: '#/definitions/models.Division'
+        allOf:
+        - $ref: '#/definitions/models.Division'
         description: 省
     type: object
   models.Arearole:
@@ -6042,7 +6056,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期均价
+        description: 期均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -6051,7 +6065,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 期初均价
+        description: 参考市值(期末市值)
         type: number
       curqty:
         description: 期末量
@@ -6069,7 +6083,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 期初均价
+        description: 参考市价(最新价)
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -6093,7 +6107,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 期初均价
+        description: 浮动损益
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -6129,7 +6143,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 期初均价
+        description: 今日采购均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -6144,7 +6158,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 期初均价
+        description: 今日销售均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -8324,7 +8338,7 @@ definitions:
         description: 合同类型 1:采购 -1:销售
         type: integer
       convertratio:
-        description: 期初均价
+        description: 折算系数
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -8342,16 +8356,16 @@ definitions:
         description: 品种名称
         type: string
       diffprice:
-        description: 期初均价
+        description: 现期价格差 = 今日点价登记均价(基价) - 今日期货成交均价
         type: number
       diffqty:
-        description: 期初均价
+        description: 期现数量差 = 套保计划量 - 今日期货关联成交量
         type: number
       enddate:
         description: 结束交易日
         type: string
       hedgeplanqty:
-        description: 期初均价
+        description: 套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例
         type: number
       matchname:
         description: 交易对手方(个人:用户名称 企业:简称)
@@ -8369,64 +8383,64 @@ definitions:
         description: 套保品种名称
         type: string
       middlegoodspricedqty:
-        description: 期初均价
+        description: 已定价量(套保品种 - 税前) = PricedQty * 折算系数
         type: number
       middlegoodspricedqty2:
-        description: 期初均价
+        description: 已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))
         type: number
       middlegoodspricedqty3:
-        description: 期初均价
+        description: 已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率
         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: 期初均价
+        description: 今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty
         type: number
       todayavgprice:
-        description: 期初均价
+        description: 今日定价均价 = TodayPricedAmount / TodayPricedQty
         type: number
       todayavgprice2:
-        description: 期初均价
+        description: 今日点价登记均价(基价) = TodayPricedAmount2 / TodayPricedQty
         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: 更新时间
@@ -8435,7 +8449,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 期初均价
+        description: 增值税率
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -8843,7 +8857,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 期初均价
+        description: 平仓均价
         type: number
       closepl:
         description: 平仓损益
@@ -8894,7 +8908,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期初均价
+        description: 期末持仓量
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -8918,13 +8932,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 期初均价
+        description: 开仓均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初均价
+        description: 期初持仓量
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -8957,7 +8971,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 期初均价
+        description: 今平仓量
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=(期末持仓量 - 期初持仓量)* 合约乘数)
@@ -8969,7 +8983,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 期初均价
+        description: 今开仓量
         type: number
       userid:
         description: 账户所属用户ID
@@ -9725,6 +9739,12 @@ definitions:
       buyshippingfeevalue:
         description: 买交收运费值
         type: number
+      buyslpoint:
+        description: 买止损点差(按账户风控)
+        type: integer
+      buytppoint:
+        description: 买止盈点差(按账户风控)
+        type: integer
       canautoadddeposit:
         description: '是否允许自动追加定金: 0-否 1-是(52)'
         type: integer
@@ -9881,32 +9901,38 @@ definitions:
       sellshippingfeevalue:
         description: 卖交收运费值
         type: number
+      sellslpoint:
+        description: 卖止损点差(按账户风控)
+        type: integer
+      selltppoint:
+        description: 卖止盈点差(按账户风控)
+        type: integer
       slratiodefault:
-        description: 止损默认比例
+        description: 止损默认比例(按单风控)
         type: number
       slratiodown:
-        description: 止损比例下限
+        description: 止损比例下限(按单风控)
         type: number
       slratioup:
-        description: 止损比例上限
+        description: 止损比例上限(按单风控)
         type: number
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
         type: string
       tpratiodefault:
-        description: 止盈默认比例
+        description: 止盈默认比例(按单风控)
         type: number
       tpratiodown:
-        description: 止盈比例下限
+        description: 止盈比例下限(按单风控)
         type: number
       tpratioup:
-        description: 止盈比例上限
+        description: 止盈比例上限(按单风控)
         type: number
       tpslflag:
-        description: 是否开启止盈止损 - 0:不开启 1:开启
+        description: 是否开启止盈止损 - 0:不开启 1:开启(按单风控、按账户风控)
         type: integer
       tpslforceflag:
-        description: 是否强制止盈止损 - 0:不强制 1:强制
+        description: 是否强制止盈止损 - 0:不强制 1:强制(按单风控)
         type: integer
       trademode:
         description: 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式
@@ -10274,7 +10300,8 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        $ref: '#/definitions/models.ErmcpRoleMenu'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -10501,7 +10528,8 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        $ref: '#/definitions/models.ErmcpTaAccountM'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -12102,7 +12130,8 @@ definitions:
   models.GetTodayAccountConfigInfoRsp:
     properties:
       riskRatioType:
-        $ref: '#/definitions/models.Riskratiotype'
+        allOf:
+        - $ref: '#/definitions/models.Riskratiotype'
         description: 风险率类型表
       todayAccountMargins:
         description: 今日账户保证金表
@@ -15620,12 +15649,12 @@ definitions:
       goodsunitid:
         description: 单位ID
         type: integer
-      marketIds:
-        description: 过滤市场ID列表,格式 1,2,3
-        type: string
       marketid:
         description: 市场ID
         type: integer
+      marketids:
+        description: 过滤市场ID列表,格式 1,2,3
+        type: string
       matchaccountid:
         description: 对手方AccountID
         type: integer
@@ -15659,12 +15688,12 @@ definitions:
       totalshippingfee:
         description: 总运费(10-线下交收)
         type: number
-      tradeModes:
-        description: 过滤交易模式列表,格式 10,53
-        type: string
       tradeid:
         description: 成交单号(10-线下交收)
         type: string
+      trademodes:
+        description: 过滤交易模式列表,格式 10,53
+        type: string
       userid:
         description: 申请用户ID
         type: integer
@@ -22378,7 +22407,8 @@ definitions:
         description: 可退定金
         type: number
       tHDetailEx:
-        $ref: '#/definitions/models.TradeHolderDetailEx'
+        allOf:
+        - $ref: '#/definitions/models.TradeHolderDetailEx'
         description: 交易持仓扩展表记录
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
@@ -22398,7 +22428,7 @@ definitions:
     type: object
   models.ReportBankAccountOutInLog:
     properties:
-      accountId:
+      accountid:
         description: 资金账户
         type: integer
       amount:
@@ -22420,7 +22450,7 @@ definitions:
       executetypedisplay:
         description: 申请类型
         type: string
-      reportType:
+      reporttype:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradedate:
@@ -22430,8 +22460,8 @@ definitions:
         description: 更新时间
         type: string
     required:
-    - accountId
-    - reportType
+    - accountid
+    - reporttype
     - tradedate
     type: object
   models.ReportReckonDayPosition:
@@ -22469,13 +22499,13 @@ definitions:
       reckondate:
         description: 日照日期(yyyyMMdd)
         type: string
-      reportType:
+      reporttype:
         description: 报表类型 日报表-1 月报表-2
         type: integer
     required:
     - accountid
     - reckondate
-    - reportType
+    - reporttype
     type: object
   models.ReportReckondaytaaccount:
     properties:
@@ -22751,7 +22781,7 @@ definitions:
       histradedate:
         description: 查询日期 日报表-yyyyMMdd 月报表-yyyyMM
         type: string
-      reportType:
+      reporttype:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradeamount:
@@ -22772,7 +22802,7 @@ definitions:
     required:
     - accountid
     - histradedate
-    - reportType
+    - reporttype
     type: object
   models.Reporttaaccount:
     properties:
@@ -23886,7 +23916,8 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -24043,7 +24074,8 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        allOf:
+        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -24222,7 +24254,8 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -25458,7 +25491,8 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        allOf:
+        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -25482,7 +25516,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -25533,7 +25567,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 期初均价
+        description: 转让数量(数量)
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -25883,7 +25917,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 期初均价
+        description: 冻结数量
         type: number
       goodscode:
         description: 商品代码
@@ -25910,7 +25944,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 期初均价
+        description: 持仓数量
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -25928,7 +25962,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 期初均价
+        description: 建仓数量
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -26235,12 +26269,12 @@ definitions:
       latefeevalue:
         description: 滞纳金收取值
         type: number
-      marketIds:
-        description: 过滤市场ID列表,格式 1,2,3
-        type: string
       marketid:
         description: 市场ID
         type: integer
+      marketids:
+        description: 过滤市场ID列表,格式 1,2,3
+        type: string
       matchaccountid:
         description: 对手账号ID
         type: integer
@@ -26280,9 +26314,6 @@ definitions:
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
         type: string
-      tradeModes:
-        description: 过滤交易模式列表,格式 10,53
-        type: string
       tradeamount:
         description: 成交金额
         type: number
@@ -26292,6 +26323,9 @@ definitions:
       tradeid:
         description: 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
         type: string
+      trademodes:
+        description: 过滤交易模式列表,格式 10,53
+        type: string
       tradetime:
         description: 交易时间
         type: string
@@ -27197,13 +27231,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 期初均价
+        description: 挂牌价格
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 期初均价
+        description: 履约保证金比例
         type: number
       marketid:
         description: 市场ID
@@ -27430,7 +27464,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 期初均价
+        description: 成交均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -27618,7 +27652,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 期初均价
+        description: 交割均价 = 交割金额 / 交割数量
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -27711,7 +27745,7 @@ definitions:
         description: 交易合约交割价
         type: number
       xgoodsamount:
-        description: 期初均价
+        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
         type: number
       xgoodscode:
         description: 商品代码
@@ -28370,7 +28404,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 期初均价
+        description: 步骤值
         type: number
       templateid:
         description: 履约计划模板ID
@@ -28605,7 +28639,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 期初均价
+        description: 挂牌金额 = 委托数量 * 固定价或升贴水
         type: number
       bannerpicurl:
         description: Banner图
@@ -28650,10 +28684,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 期初均价
+        description: 冻结手续费
         type: number
       freezemargin:
-        description: 期初均价
+        description: 冻结保证金(保证金)
         type: number
       futupricemove:
         description: 期货升贴水
@@ -28680,7 +28714,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 期初均价
+        description: 保证金设置值(履约保证金)
         type: number
       marketid:
         description: 市场ID
@@ -28861,7 +28895,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverymonth:
         description: 交收月
@@ -29179,7 +29213,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 期初均价
+        description: 剩余款(待支付金额)
         type: number
       userid:
         description: 用户id
@@ -29343,7 +29377,7 @@ definitions:
         description: 步骤类型名称
         type: string
     type: object
-  models.WrPerformanceTemplateEx:
+  models.WrPerformanceTemplate:
     properties:
       autoid:
         description: AutoID 模板id
@@ -29354,11 +29388,6 @@ definitions:
       creatorid:
         description: 创建人
         type: integer
-      lstStep:
-        description: 步骤信息列表
-        items:
-          $ref: '#/definitions/models.WrGoodsPerformanceStep'
-        type: array
       paymenttype:
         description: 支付方式 - 1:冻结 2:扣款
         type: integer
@@ -29376,6 +29405,16 @@ definitions:
         description: 所属用户
         type: integer
     type: object
+  models.WrPerformanceTemplateEx:
+    properties:
+      extends:
+        $ref: '#/definitions/models.WrPerformanceTemplate'
+      lstStep:
+        description: 步骤信息列表
+        items:
+          $ref: '#/definitions/models.WrGoodsPerformanceStep'
+        type: array
+    type: object
   models.WrPosition:
     properties:
       accountid:
@@ -29591,7 +29630,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -29693,10 +29732,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 期初均价
+        description: 日成交金额(当日单方向成交金额)
         type: number
       tradeqty:
-        description: 期初均价
+        description: 日成交数量(当日单方向成交数量)
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -29823,7 +29862,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 期初均价
+        description: 未结费用
         type: number
       updatetime:
         description: 更新时间
@@ -30292,7 +30331,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -32664,10 +32703,12 @@ definitions:
   tencent.CreateFlowByTemplateDirectlyReq:
     properties:
       organizationInfo:
-        $ref: '#/definitions/tencent.OrganizationInfo'
+        allOf:
+        - $ref: '#/definitions/tencent.OrganizationInfo'
         description: 签署企业信息,用户类型为企业时必填
       personInfo:
-        $ref: '#/definitions/tencent.PersonInfo'
+        allOf:
+        - $ref: '#/definitions/tencent.PersonInfo'
         description: 签署人信息,用户类型为个人时必填
       userESignRecordID:
         description: 用户电子签记录表ID 只有当前状态是1和4的电子签记录才能发起合同签署
@@ -32791,7 +32832,8 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        $ref: '#/definitions/models.Loginaccount'
+        allOf:
+        - $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -32804,10 +32846,12 @@ definitions:
           $ref: '#/definitions/models.Systemparam'
         type: array
       userAccount:
-        $ref: '#/definitions/models.Useraccount'
+        allOf:
+        - $ref: '#/definitions/models.Useraccount'
         description: 用户账号
       userInfo:
-        $ref: '#/definitions/models.Userinfo'
+        allOf:
+        - $ref: '#/definitions/models.Userinfo'
         description: 用户信息
       username:
         description: 用户姓名
@@ -38244,11 +38288,13 @@ paths:
     get:
       parameters:
       - description: 策略申请ID
+        format: int64
         in: query
         name: asapplyid
         required: true
         type: integer
       - description: 现货合同ID
+        format: int64
         in: query
         name: spotcontractid
         type: integer
@@ -38885,6 +38931,7 @@ paths:
         required: true
         type: integer
       - description: 定金比例(选中比例)
+        format: float64
         in: query
         name: depositrate
         required: true
@@ -39774,16 +39821,19 @@ paths:
         required: true
         type: string
       - description: 重量
+        format: float64
         in: query
         name: weight
         required: true
         type: number
       - description: 汇率
+        format: float64
         in: query
         name: rate
         required: true
         type: number
       - description: 折扣(%), 方向(加:10, 减:-10 )
+        format: float64
         in: query
         name: discount
         type: number

+ 18 - 9
models/ermcpGoods.go

@@ -114,18 +114,23 @@ type ErmcpGoods struct {
 	RISKCONTROLMODE      int32  `json:"riskcontrolmode" xorm:"RISKCONTROLMODE"`           // 风控方式(52、10模式) 1:按单风控 2:按账户风控
 	GOODSNAMEVI          string `json:"goodsnamevi" xorm:"GOODSNAMEVI"`                   // 期货合约名称(越南语)
 
-	TPSLFLAG       int32   `json:"tpslflag"  xorm:"TPSLFLAG"`            // 是否开启止盈止损 - 0:不开启 1:开启
-	TPSLFORCEFLAG  int32   `json:"tpslforceflag"  xorm:"TPSLFORCEFLAG"`  // 是否强制止盈止损 - 0:不强制 1:强制
-	TPRATIODOWN    float64 `json:"tpratiodown" xorm:"TPRATIODOWN"`       // 止盈比例下限
-	TPRATIOUP      float64 `json:"tpratioup" xorm:"TPRATIOUP"`           // 止盈比例上限
-	TPRATIODEFAULT float64 `json:"tpratiodefault" xorm:"TPRATIODEFAULT"` // 止盈默认比例
-	SLRATIODOWN    float64 `json:"slratiodown" xorm:"SLRATIODOWN"`       // 止损比例下限
-	SLRATIOUP      float64 `json:"slratioup" xorm:"SLRATIOUP"`           // 止损比例上限
-	SLRATIODEFAULT float64 `json:"slratiodefault" xorm:"SLRATIODEFAULT"` // 止损默认比例
+	TPSLFLAG       int32   `json:"tpslflag"  xorm:"TPSLFLAG"`            // 是否开启止盈止损 - 0:不开启 1:开启(按单风控、按账户风控)
+	TPSLFORCEFLAG  int32   `json:"tpslforceflag"  xorm:"TPSLFORCEFLAG"`  // 是否强制止盈止损 - 0:不强制 1:强制(按单风控)
+	TPRATIODOWN    float64 `json:"tpratiodown" xorm:"TPRATIODOWN"`       // 止盈比例下限(按单风控)
+	TPRATIOUP      float64 `json:"tpratioup" xorm:"TPRATIOUP"`           // 止盈比例上限(按单风控)
+	TPRATIODEFAULT float64 `json:"tpratiodefault" xorm:"TPRATIODEFAULT"` // 止盈默认比例(按单风控)
+	SLRATIODOWN    float64 `json:"slratiodown" xorm:"SLRATIODOWN"`       // 止损比例下限(按单风控)
+	SLRATIOUP      float64 `json:"slratioup" xorm:"SLRATIOUP"`           // 止损比例上限(按单风控)
+	SLRATIODEFAULT float64 `json:"slratiodefault" xorm:"SLRATIODEFAULT"` // 止损默认比例(按单风控)
 
 	BASECURRENCYCODE  string `json:"basecurrencycode" xorm:"BASECURRENCYCODE"`   // 基础货币代码(80:Goodscurrencyid)
 	QUOTECURRENCYCODE string `json:"quotecurrencycode" xorm:"QUOTECURRENCYCODE"` // 计价货币代码(80:currencyid)
 
+	BUYTPPOINT  int32 `json:"buytppoint"  xorm:"BUYTPPOINT"`   // 买止盈点差(按账户风控)
+	BUYSLPOINT  int32 `json:"buyslpoint"  xorm:"BUYSLPOINT"`   // 买止损点差(按账户风控)
+	SELLTPPOINT int32 `json:"selltppoint"  xorm:"SELLTPPOINT"` // 卖止盈点差(按账户风控)
+	SELLSLPOINT int32 `json:"sellslpoint"  xorm:"SELLSLPOINT"` // 卖止损点差(按账户风控)
+
 }
 
 // GetErmcpGoodses 企业风管专用获取商品信息的方法
@@ -195,7 +200,11 @@ func GetErmcpGoodses(userid int64, lastUpdateTime string, loginID int64) ([]Ermc
 			EX.SLRATIOUP,
 			EX.SLRATIODEFAULT,
 			EN1.ENUMDICNAME BASECURRENCYCODE,
-			EN2.ENUMDICNAME QUOTECURRENCYCODE     
+			EN2.ENUMDICNAME QUOTECURRENCYCODE,
+			EX.BUYTPPOINT,
+			EX.BuySLPOINT,
+			EX.SELLTPPOINT,
+			EX.SELLSLPOINT
 			`).
 		Join("LEFT", "MARKET M", "M.MARKETID = G.MARKETID").
 		Join("LEFT", "GOODSMARGINCONFIG GM", "GM.GOODSID = G.GOODSID AND GM.ISDEFAULT = 1").

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio