Explorar o código

Common/GetHotGoodses:返回对象修改为“ErmcpGoods“

deng.yinping hai 2 semanas
pai
achega
edb1dde8aa
Modificáronse 5 ficheiros con 556 adicións e 627 borrados
  1. 1 1
      controllers/common/common.go
  2. 199 208
      docs/docs.go
  3. 198 206
      docs/swagger.json
  4. 152 181
      docs/swagger.yaml
  5. 6 31
      models/common.go

+ 1 - 1
controllers/common/common.go

@@ -389,7 +389,7 @@ func GetClientDocumnetConfigs(c *gin.Context) {
 // GetHotGoodses  查询热门商品(按上日成交额,持仓额倒序)
 // @Summary 查询热门商品(按上日成交额,持仓额倒序)
 // @Produce json
-// @Success 200 {array}  models.GetHotGoodsesRsp
+// @Success 200 {array}  models.ErmcpGoods
 // @Failure 500 {object} app.Response
 // @Router  /Common/GetHotGoodses [get]
 // @Tags    通用服务

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


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


+ 152 - 181
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:
@@ -6060,7 +6074,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期均价
+        description: 期均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -6069,7 +6083,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 期初均价
+        description: 参考市值(期末市值)
         type: number
       curqty:
         description: 期末量
@@ -6087,7 +6101,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 期初均价
+        description: 参考市价(最新价)
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -6111,7 +6125,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 期初均价
+        description: 浮动损益
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -6147,7 +6161,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 期初均价
+        description: 今日采购均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -6162,7 +6176,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 期初均价
+        description: 今日销售均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -8342,7 +8356,7 @@ definitions:
         description: 合同类型 1:采购 -1:销售
         type: integer
       convertratio:
-        description: 期初均价
+        description: 折算系数
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -8360,16 +8374,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: 交易对手方(个人:用户名称 企业:简称)
@@ -8387,64 +8401,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: 更新时间
@@ -8453,7 +8467,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 期初均价
+        description: 增值税率
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -8861,7 +8875,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 期初均价
+        description: 平仓均价
         type: number
       closepl:
         description: 平仓损益
@@ -8912,7 +8926,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期初均价
+        description: 期末持仓量
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -8936,13 +8950,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 期初均价
+        description: 开仓均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初均价
+        description: 期初持仓量
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -8975,7 +8989,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 期初均价
+        description: 今平仓量
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=(期末持仓量 - 期初持仓量)* 合约乘数)
@@ -8987,7 +9001,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 期初均价
+        description: 今开仓量
         type: number
       userid:
         description: 账户所属用户ID
@@ -10304,7 +10318,8 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        $ref: '#/definitions/models.ErmcpRoleMenu'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -10531,7 +10546,8 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        $ref: '#/definitions/models.ErmcpTaAccountM'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -12054,73 +12070,6 @@ definitions:
         description: 支付跳转地址
         type: string
     type: object
-  models.GetHotGoodsesRsp:
-    properties:
-      bannerurls:
-        description: Banner图片(2:1)(逗号分隔)
-        type: string
-      buyholdamount:
-        description: 买持仓额
-        type: number
-      currencyid:
-        description: 报价货币ID(80:计价货币)
-        type: integer
-      decimalplace:
-        description: 报价小数位
-        type: integer
-      goodscode:
-        description: 商品代码(内部)
-        type: string
-      goodscurrencyid:
-        description: 合约货币ID(80:基础货币)
-        type: integer
-      goodsid:
-        description: 商品ID
-        type: integer
-      goodsname:
-        description: 商品名称
-        type: string
-      goodsnameen:
-        description: 期货合约名称(英文)
-        type: string
-      goodsnameth:
-        description: 期货合约名称泰文)
-        type: string
-      goodsnametw:
-        description: 期货合约名称(繁体)
-        type: string
-      goodsnamevi:
-        description: 期货合约名称(越南语)
-        type: string
-      marketid:
-        description: 市场ID
-        type: integer
-      outgoodscode:
-        description: 商品代码(外部)
-        type: string
-      pictureurl:
-        description: 商品图片
-        type: string
-      quoteminunit:
-        description: 行情最小变动单位 [整数,报价小数位一起使用]
-        type: integer
-      reckondate:
-        description: 日期
-        type: string
-      sellholdamount:
-        description: 卖持仓额
-        type: number
-      thumurls:
-        description: 缩略图片(1:1)(逗号分隔)
-        type: string
-      tradeamount:
-        description: 成交额
-        type: number
-      trademode:
-        description: 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式
-          21:竞拍-大宗式 22:受托竞价
-        type: integer
-    type: object
   models.GetJ10NewsData:
     properties:
       content:
@@ -12199,7 +12148,8 @@ definitions:
   models.GetTodayAccountConfigInfoRsp:
     properties:
       riskRatioType:
-        $ref: '#/definitions/models.Riskratiotype'
+        allOf:
+        - $ref: '#/definitions/models.Riskratiotype'
         description: 风险率类型表
       todayAccountMargins:
         description: 今日账户保证金表
@@ -15717,12 +15667,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
@@ -15756,12 +15706,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
@@ -22486,7 +22436,8 @@ definitions:
         description: 可退定金
         type: number
       tHDetailEx:
-        $ref: '#/definitions/models.TradeHolderDetailEx'
+        allOf:
+        - $ref: '#/definitions/models.TradeHolderDetailEx'
         description: 交易持仓扩展表记录
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
@@ -22506,7 +22457,7 @@ definitions:
     type: object
   models.ReportBankAccountOutInLog:
     properties:
-      accountId:
+      accountid:
         description: 资金账户
         type: integer
       amount:
@@ -22528,7 +22479,7 @@ definitions:
       executetypedisplay:
         description: 申请类型
         type: string
-      reportType:
+      reporttype:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradedate:
@@ -22538,8 +22489,8 @@ definitions:
         description: 更新时间
         type: string
     required:
-    - accountId
-    - reportType
+    - accountid
+    - reporttype
     - tradedate
     type: object
   models.ReportReckonDayPosition:
@@ -22577,13 +22528,13 @@ definitions:
       reckondate:
         description: 日照日期(yyyyMMdd)
         type: string
-      reportType:
+      reporttype:
         description: 报表类型 日报表-1 月报表-2
         type: integer
     required:
     - accountid
     - reckondate
-    - reportType
+    - reporttype
     type: object
   models.ReportReckondaytaaccount:
     properties:
@@ -22859,7 +22810,7 @@ definitions:
       histradedate:
         description: 查询日期 日报表-yyyyMMdd 月报表-yyyyMM
         type: string
-      reportType:
+      reporttype:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradeamount:
@@ -22880,7 +22831,7 @@ definitions:
     required:
     - accountid
     - histradedate
-    - reportType
+    - reporttype
     type: object
   models.Reporttaaccount:
     properties:
@@ -23994,7 +23945,8 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -24151,7 +24103,8 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        allOf:
+        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -24330,7 +24283,8 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -25579,7 +25533,8 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        allOf:
+        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -25603,7 +25558,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -25654,7 +25609,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 期初均价
+        description: 转让数量(数量)
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -26004,7 +25959,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 期初均价
+        description: 冻结数量
         type: number
       goodscode:
         description: 商品代码
@@ -26031,7 +25986,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 期初均价
+        description: 持仓数量
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -26049,7 +26004,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 期初均价
+        description: 建仓数量
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -26385,12 +26340,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
@@ -26430,9 +26385,6 @@ definitions:
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
         type: string
-      tradeModes:
-        description: 过滤交易模式列表,格式 10,53
-        type: string
       tradeamount:
         description: 成交金额
         type: number
@@ -26442,6 +26394,9 @@ definitions:
       tradeid:
         description: 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
         type: string
+      trademodes:
+        description: 过滤交易模式列表,格式 10,53
+        type: string
       tradetime:
         description: 交易时间
         type: string
@@ -27347,13 +27302,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 期初均价
+        description: 挂牌价格
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 期初均价
+        description: 履约保证金比例
         type: number
       marketid:
         description: 市场ID
@@ -27634,7 +27589,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 期初均价
+        description: 成交均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -27822,7 +27777,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 期初均价
+        description: 交割均价 = 交割金额 / 交割数量
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -27915,7 +27870,7 @@ definitions:
         description: 交易合约交割价
         type: number
       xgoodsamount:
-        description: 期初均价
+        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
         type: number
       xgoodscode:
         description: 商品代码
@@ -28580,7 +28535,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 期初均价
+        description: 步骤值
         type: number
       templateid:
         description: 履约计划模板ID
@@ -28815,7 +28770,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 期初均价
+        description: 挂牌金额 = 委托数量 * 固定价或升贴水
         type: number
       bannerpicurl:
         description: Banner图
@@ -28860,10 +28815,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 期初均价
+        description: 冻结手续费
         type: number
       freezemargin:
-        description: 期初均价
+        description: 冻结保证金(保证金)
         type: number
       futupricemove:
         description: 期货升贴水
@@ -28890,7 +28845,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 期初均价
+        description: 保证金设置值(履约保证金)
         type: number
       marketid:
         description: 市场ID
@@ -29071,7 +29026,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverymonth:
         description: 交收月
@@ -29389,7 +29344,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 期初均价
+        description: 剩余款(待支付金额)
         type: number
       userid:
         description: 用户id
@@ -29553,7 +29508,7 @@ definitions:
         description: 步骤类型名称
         type: string
     type: object
-  models.WrPerformanceTemplateEx:
+  models.WrPerformanceTemplate:
     properties:
       autoid:
         description: AutoID 模板id
@@ -29564,11 +29519,6 @@ definitions:
       creatorid:
         description: 创建人
         type: integer
-      lstStep:
-        description: 步骤信息列表
-        items:
-          $ref: '#/definitions/models.WrGoodsPerformanceStep'
-        type: array
       paymenttype:
         description: 支付方式 - 1:冻结 2:扣款
         type: integer
@@ -29586,6 +29536,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:
@@ -29801,7 +29761,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -29903,10 +29863,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 期初均价
+        description: 日成交金额(当日单方向成交金额)
         type: number
       tradeqty:
-        description: 期初均价
+        description: 日成交数量(当日单方向成交数量)
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -30033,7 +29993,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 期初均价
+        description: 未结费用
         type: number
       updatetime:
         description: 更新时间
@@ -30502,7 +30462,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -32880,10 +32840,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的电子签记录才能发起合同签署
@@ -33007,7 +32969,8 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        $ref: '#/definitions/models.Loginaccount'
+        allOf:
+        - $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -33020,10 +32983,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: 用户姓名
@@ -34069,7 +34034,7 @@ paths:
           description: OK
           schema:
             items:
-              $ref: '#/definitions/models.GetHotGoodsesRsp'
+              $ref: '#/definitions/models.ErmcpGoods'
             type: array
         "500":
           description: Internal Server Error
@@ -38508,11 +38473,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
@@ -39149,6 +39116,7 @@ paths:
         required: true
         type: integer
       - description: 定金比例(选中比例)
+        format: float64
         in: query
         name: depositrate
         required: true
@@ -40038,16 +40006,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

+ 6 - 31
models/common.go

@@ -1706,38 +1706,13 @@ func GetUserScoreDetail(userID int) (datas []QueryUserScoreDetailRsp, err error)
 	return rspdatas, nil
 }
 
-type GetHotGoodsesRsp struct {
-	ReckonDate     string  `json:"reckondate" xorm:"'RECKONDATE'"`           // 日期
-	GoodsID        int64   `json:"goodsid" xorm:"'GOODSID'"`                 // 商品ID
-	MarketID       int64   `json:"marketid" xorm:"'MARKETID'"`               // 市场ID
-	TradeAmount    float64 `json:"tradeamount" xorm:"'TRADEAMOUNT'"`         // 成交额
-	BuyHoldAmount  float64 `json:"buyholdamount" xorm:"'CURBUYHOLDAMOUNT'"`  // 买持仓额
-	SellHoldAmount float64 `json:"sellholdamount" xorm:"'CURSELLHODAMOUNT'"` // 卖持仓额
-
-	GoodsCode      string `json:"goodscode"  xorm:"'GOODSCODE'"`             // 商品代码(内部)
-	GoodsName      string `json:"goodsname"  xorm:"'GOODSNAME'"`             // 商品名称
-	CurrencyID     int64  `json:"currencyid"  xorm:"'CURRENCYID'"`           // 报价货币ID(80:计价货币)
-	GoodCurrencyID int64  `json:"goodscurrencyid"  xorm:"'GOODSCURRENCYID'"` // 合约货币ID(80:基础货币)
-	DecimalPlace   int64  `json:"decimalplace"  xorm:"'DECIMALPLACE'"`       // 报价小数位
-	QuoteMinUnit   int64  `json:"quoteminunit"  xorm:"'QUOTEMINUNIT'"`       // 行情最小变动单位 [整数,报价小数位一起使用]
-	OutGoodsCode   string `json:"outgoodscode"  xorm:"'OUTGOODSCODE'"`       // 商品代码(外部)
-	PictureUrl     string `json:"pictureurl"  xorm:"PICTUREURL"`             // 商品图片
-	ThumUrls       string `json:"thumurls" xorm:"THUMURLS"`                  // 缩略图片(1:1)(逗号分隔)
-	BannerUrls     string `json:"bannerurls" xorm:"BANNERURLS"`              // Banner图片(2:1)(逗号分隔)
-	TradeMode      int32  `json:"trademode"  xorm:"'TRADEMODE'"`             // 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价
-	GoodsNameTh    string `json:"goodsnameth" xorm:"GOODSNAMETH"`            // 期货合约名称泰文)
-	GoodsNameEn    string `json:"goodsnameen" xorm:"GOODSNAMEEN"`            // 期货合约名称(英文)
-	GoodsNameTw    string `json:"goodsnametw" xorm:"GOODSNAMETW"`            // 期货合约名称(繁体)
-	GoodsNameVi    string `json:"goodsnamevi" xorm:"GOODSNAMEVI"`            // 期货合约名称(越南语)
-}
-
-func GetHotGoodses() (rsp []GetHotGoodsesRsp, err error) {
-	rspdatas := make([]GetHotGoodsesRsp, 0)
+func GetHotGoodses() (rsp []ErmcpGoods, err error) {
+	rspdatas := make([]ErmcpGoods, 0)
 	sql := `
-		SELECT T.RECKONDATE, T.GOODSID, T.MARKETID, 
-		T.TRADEAMOUNT, T.TRADELOT, T.CURBUYHOLDAMOUNT, T.CURSELLHODAMOUNT,
-		G.GOODSCODE, G.GOODSNAME, G.CURRENCYID, G.GOODSCURRENCYID, G.DECIMALPLACE, G.QUOTEMINUNIT,
-		G.OUTGOODSCODE, G.PICTUREURL, G.THUMURLS, G.BANNERURLS, M.TRADEMODE, GE.GOODSNAMEEN,
+		SELECT 
+		G.GOODSID, G.GOODSCODE, G.GOODSNAME, G.MARKETID, G.GOODUNITID, G.AGREEUNIT,
+		G.CURRENCYID, G.GOODSCURRENCYID, G.DECIMALPLACE, G.QUOTEMINUNIT, G.OUTGOODSCODE, 
+		G.PICTUREURL, G.THUMURLS, G.BANNERURLS, M.TRADEMODE, GE.GOODSNAMEEN,
 		GE.GOODSNAMETW, GE.GOODSNAMETH, GE.GOODSNAMEVI
 		FROM RECKON_DAYGOODSCOUNT T
 		INNER JOIN GOODS G ON G.GOODSID = T.GOODSID

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