Bladeren bron

修改 /Wallet/QueryWalletAddress 接口BUG

muchinfo 3 weken geleden
bovenliggende
commit
94c00e402f
7 gewijzigde bestanden met toevoegingen van 514 en 561 verwijderingen
  1. 7 7
      config/config.xml
  2. 4 4
      controllers/guangzuan/tradeService.go
  3. 2 2
      controllers/tradexx/qryTradexx.go
  4. 161 189
      docs/docs.go
  5. 166 188
      docs/swagger.json
  6. 152 156
      docs/swagger.yaml
  7. 22 15
      models/wallet.go

+ 7 - 7
config/config.xml

@@ -16,11 +16,11 @@
     <DbName value="orcl"/>
     <DbPort value="1521"/>
     <!-- DbUser DbPwd 支持明文密文 -->
-    <DbUser value="mtp2_test208"/>
+    <DbUser value="mtp2_test136"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.208"/>
+    <Address value="192.168.31.136"/>
     <Port value="5007"/>
     <Timeout value="3"/>
     <ConnNum value="1"/>
@@ -30,11 +30,11 @@
   </RedisSetting>
   <MqSetting>
     <!-- Url 支持明文密文 -->
-    <Url value="amqp://guest:guest@192.168.31.208:5020/test"/>
+    <Url value="amqp://guest:guest@192.168.31.136:5020/test"/>
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.208"/>
+    <HostName value="192.168.31.136"/>
     <Port value="5025"/>
     <DBName value="HistoryQuote"/>
     <!-- Username Password 支持明文密文 -->
@@ -47,9 +47,9 @@
     <Enabled value="0"/>
     <Host value="192.168.30.72"/>
     <Port value="3306"/>
-    <DBName value="historyquote_test208"/>
+    <DBName value="historyquote_test136"/>
     <!-- Username Password 支持明文密文 -->
-    <Username value="quote_test208"/>
+    <Username value="quote_test136"/>
     <Password value="123456"/>
   </MySQLSetting>
 <Tencent>
@@ -69,7 +69,7 @@
     <AppId value=""/>
     <PrivateKey value=""/>
     <NotifyUrl value="http://218.17.158.45:15105/api/Asign/HandleASignCompleted"/>
-    <OpenApiUrl value="http://192.168.31.208:5015/mtp2-onlineopen"/>
+    <OpenApiUrl value="http://192.168.31.136:5015/mtp2-onlineopen"/>
     <Account value="12345678"/>
   </Asign>
   <TencentCloud>

+ 4 - 4
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]

+ 2 - 2
controllers/tradexx/qryTradexx.go

@@ -17,12 +17,12 @@ import (
 // @Summary  查询持仓明细
 // @Produce  json
 // @Security ApiKeyAuth
-// @Param    userid          query    int    true "用户id"
+// @Param    userid          query    int    true  "用户id"
 // @Param    accids          query    string false "资金账号, 格式 1,2,3"
 // @Param    trademodes      query    string false "交易模式, 格式 1,2,3"
 // @Param    marketids       query    string false "市场id, 格式 1,2,3"
 // @Param    goodsid         query    int    false "商品id"
-// @Param    tradeid		 query    string false "成交单号"
+// @Param    tradeid                         query string false "成交单号"
 // @Param    buyorsell       query    int    false "买卖方向 0-买 1-卖"
 // @Param    riskcontrolmode query    int    false "风控方式(52模式) 1:按单风控 2:按账户风控"
 // @Success  200             {array}  models.TradeHolderDetail

File diff suppressed because it is too large
+ 161 - 189
docs/docs.go


File diff suppressed because it is too large
+ 166 - 188
docs/swagger.json


+ 152 - 156
docs/swagger.yaml

@@ -333,8 +333,7 @@ definitions:
         description: 合同编号(此处可传已完成签署的合同编号,实现追加签章的场景)
         type: string
       fillData:
-        allOf:
-        - $ref: '#/definitions/asign.APIFillData'
+        $ref: '#/definitions/asign.APIFillData'
         description: 单行文本、多行文本、日期、身份证类型参数填充。
       tableDatas:
         description: 表格填充数据
@@ -364,12 +363,10 @@ definitions:
   asign.BankCard4Req:
     properties:
       company:
-        allOf:
-        - $ref: '#/definitions/asign.CompanyBankCard4'
+        $ref: '#/definitions/asign.CompanyBankCard4'
         description: 企业法人银行卡四要素,实体类型为企业时必填
       person:
-        allOf:
-        - $ref: '#/definitions/asign.PersonBankCard4'
+        $ref: '#/definitions/asign.PersonBankCard4'
         description: 个人银行卡四要素,实体类型为个人时必填
       type:
         description: 实体类型 1:个人 2:企业
@@ -735,8 +732,7 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        allOf:
-        - $ref: '#/definitions/models.Division'
+        $ref: '#/definitions/models.Division'
         description: 省
     type: object
   common.QueryTableDefineRsp:
@@ -1784,7 +1780,7 @@ definitions:
   ermcp.QryBusinessDjRsp:
     properties:
       amount:
-        description: 点价金额=(点价价格+升贴水)*点价数量
+        description: 期初均价
         type: number
       applyid:
         description: 申请人
@@ -2219,7 +2215,7 @@ definitions:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
       deductamount:
-        description: 退款(非必填)
+        description: 期初均价
         type: number
       deliverygoodscode:
         description: 现货品种代码
@@ -2249,7 +2245,7 @@ definitions:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
       payamount:
-        description: 收付款(非必填)
+        description: 期初均价
         type: number
       pricemove:
         description: 升贴水
@@ -2371,8 +2367,7 @@ definitions:
           $ref: '#/definitions/models.ErmcpGGConvertCfg'
         type: array
       mg:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
+        $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
         description: 套保品种基本信息
       wrcList:
         description: 现货品种列表(现货商品折算配置)
@@ -2817,32 +2812,25 @@ definitions:
         description: 套利量
         type: number
       diffArbitrageQty:
-        description: 套利变动量
-        format: float64
+        description: 期初均价
         type: number
       diffExposoureQty:
-        description: 变动量(套保敞口)
-        format: float64
+        description: 期初均价
         type: number
       diffFutuQty:
-        description: 变动量(期货总量) 平安:保值净持仓量今日变动
-        format: float64
+        description: 期初均价
         type: number
       diffHedgeQty:
-        description: 套保变动量
-        format: float64
+        description: 期初均价
         type: number
       diffQty:
-        description: 变动量(总敞口) 平安:净敞口今日变动
-        format: float64
+        description: 期初均价
         type: number
       diffSpotHedgeQty:
-        description: 变动量(现货应套保总量) 平安:应套保量今日变动
-        format: float64
+        description: 期初均价
         type: number
       diffSpotQty:
-        description: 变动量(现货总量) = 现货数量 - 期初现货数量 平安:采销定价净值今日变动
-        format: float64
+        description: 期初均价
         type: number
       enumdicname:
         description: 单位名称
@@ -4044,8 +4032,7 @@ definitions:
           $ref: '#/definitions/erms3.CustomerInfo'
         type: array
       ouruser:
-        allOf:
-        - $ref: '#/definitions/erms3.CustomerInfo'
+        $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
       warehouseinfos:
         description: 仓库信息列表
@@ -4290,8 +4277,7 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        allOf:
-        - $ref: '#/definitions/models.Division'
+        $ref: '#/definitions/models.Division'
         description: 省
     type: object
   models.Arearole:
@@ -4959,18 +4945,21 @@ definitions:
     type: object
   models.DigitalWalletAddress:
     properties:
+      addr_type:
+        description: 地址类型:1-充值;2-提现
+        type: integer
       address:
         description: 区块链地址
         type: string
-      addrtype:
-        description: 地址类型:1-充值;2-提现
-        type: integer
-      chaincode:
+      chain_id:
         description: 链代码(如BTC,ETH)
         type: string
-      channelcode:
+      channel_code:
         description: 渠道代码
         type: string
+      create_time:
+        description: 创建时间
+        type: string
       digitalaccountid:
         description: 数字账户ID
         type: integer
@@ -4980,6 +4969,15 @@ definitions:
       memo:
         description: 地址备注(某些链需要)
         type: string
+      status:
+        description: 状态:0-禁用;1-启用
+        type: integer
+      token_id:
+        description: 代币ID(充值类型必填)
+        type: string
+      update_time:
+        description: 修改时间
+        type: string
     required:
     - digitalaccountid
     type: object
@@ -5013,6 +5011,9 @@ definitions:
         description: 客户端类型 - 0:保留为未填终端类型 1:PC管理端 2:PC交易端 3:手机客户端_安卓 4:网页客户端 5:微信客户端
           6:手机客户端_苹果 7:网上开户客户端 8:无效终端编号 9:报价终端(中江)
         type: integer
+      digitalaccountid:
+        description: 数字账户ID
+        type: string
       freezecharge:
         description: 冻结手续费
         type: number
@@ -5055,6 +5056,9 @@ definitions:
       orderstatus:
         description: 委托状态 - 参考枚举''orderstatus'' - 1:委托请求  2:待冻结  3:委托成功  4:委托失败  5:配对成功  6:已撤  7:部成  8:已成  9:部成部撤  10:成交失败  11:委托拒绝  12:经过摘牌(先摘后挂专用)  13:冻结成功(通道交易专用)  14:通道已撤  15:通道部成部撤  16:成交失败违约(荷兰式竞拍专用)  17:冻结PD成功  18:冻结PD失败  19:冻结能量成功  20:冻结能量失败  21:预约已报价  22:过期未付  23:优惠券处理中  24:仓单生成失败  25:首付扣款失败  26:履约失败  27:撤单解冻贷款失败
         type: integer
+      orderstatuses:
+        description: 委托状态(多个逗号分隔) 参考枚举orderstatus
+        type: string
       ordertime:
         description: 委托时间
         type: string
@@ -5129,6 +5133,9 @@ definitions:
       buyorsell:
         description: 方向 - 0:买 1:卖
         type: integer
+      digitalaccountid:
+        description: 数字账户ID
+        type: string
       goodsid:
         description: 商品ID
         type: integer
@@ -6056,7 +6063,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期均价
+        description: 期均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -6065,7 +6072,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 参考市值(期末市值)
+        description: 期初均价
         type: number
       curqty:
         description: 期末量
@@ -6083,7 +6090,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 参考市价(最新价)
+        description: 期初均价
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -6107,7 +6114,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 浮动损益
+        description: 期初均价
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -6143,7 +6150,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 今日采购均价
+        description: 期初均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -6158,7 +6165,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 今日销售均价
+        description: 期初均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -8338,7 +8345,7 @@ definitions:
         description: 合同类型 1:采购 -1:销售
         type: integer
       convertratio:
-        description: 折算系数
+        description: 期初均价
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -8356,16 +8363,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: 交易对手方(个人:用户名称 企业:简称)
@@ -8383,64 +8390,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: 更新时间
@@ -8449,7 +8456,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 增值税率
+        description: 期初均价
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -8857,7 +8864,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 平仓均价
+        description: 期初均价
         type: number
       closepl:
         description: 平仓损益
@@ -8908,7 +8915,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期末持仓量
+        description: 期初均价
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -8932,13 +8939,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 开仓均价
+        description: 期初均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初持仓量
+        description: 期初均价
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -8971,7 +8978,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 今平仓量
+        description: 期初均价
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=(期末持仓量 - 期初持仓量)* 合约乘数)
@@ -8983,7 +8990,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 今开仓量
+        description: 期初均价
         type: number
       userid:
         description: 账户所属用户ID
@@ -10300,8 +10307,7 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpRoleMenu'
+        $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -10528,8 +10534,7 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpTaAccountM'
+        $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -12130,8 +12135,7 @@ definitions:
   models.GetTodayAccountConfigInfoRsp:
     properties:
       riskRatioType:
-        allOf:
-        - $ref: '#/definitions/models.Riskratiotype'
+        $ref: '#/definitions/models.Riskratiotype'
         description: 风险率类型表
       todayAccountMargins:
         description: 今日账户保证金表
@@ -15649,12 +15653,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
@@ -15688,12 +15692,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
@@ -22407,8 +22411,7 @@ definitions:
         description: 可退定金
         type: number
       tHDetailEx:
-        allOf:
-        - $ref: '#/definitions/models.TradeHolderDetailEx'
+        $ref: '#/definitions/models.TradeHolderDetailEx'
         description: 交易持仓扩展表记录
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
@@ -22428,7 +22431,7 @@ definitions:
     type: object
   models.ReportBankAccountOutInLog:
     properties:
-      accountid:
+      accountId:
         description: 资金账户
         type: integer
       amount:
@@ -22450,7 +22453,7 @@ definitions:
       executetypedisplay:
         description: 申请类型
         type: string
-      reporttype:
+      reportType:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradedate:
@@ -22460,8 +22463,8 @@ definitions:
         description: 更新时间
         type: string
     required:
-    - accountid
-    - reporttype
+    - accountId
+    - reportType
     - tradedate
     type: object
   models.ReportReckonDayPosition:
@@ -22499,13 +22502,13 @@ definitions:
       reckondate:
         description: 日照日期(yyyyMMdd)
         type: string
-      reporttype:
+      reportType:
         description: 报表类型 日报表-1 月报表-2
         type: integer
     required:
     - accountid
     - reckondate
-    - reporttype
+    - reportType
     type: object
   models.ReportReckondaytaaccount:
     properties:
@@ -22781,7 +22784,7 @@ definitions:
       histradedate:
         description: 查询日期 日报表-yyyyMMdd 月报表-yyyyMM
         type: string
-      reporttype:
+      reportType:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradeamount:
@@ -22802,7 +22805,7 @@ definitions:
     required:
     - accountid
     - histradedate
-    - reporttype
+    - reportType
     type: object
   models.Reporttaaccount:
     properties:
@@ -23916,8 +23919,7 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -24074,8 +24076,7 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -24254,8 +24255,7 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -24450,6 +24450,9 @@ definitions:
       currencyid:
         description: 货币ID - 枚举"digitalcurrency"
         type: integer
+      currencyids:
+        description: 币种ID(多个逗号分隔)
+        type: string
       currentbalance:
         description: 期末余额
         type: number
@@ -24524,6 +24527,9 @@ definitions:
       applyamount:
         description: 申请金额
         type: number
+      applydate:
+        description: 申请日期(yyyyMMdd)
+        type: string
       applyid:
         description: 申请ID(403+Unix秒时间戳(10位)+xxxxxx)
         type: string
@@ -24574,6 +24580,9 @@ definitions:
       revoketime:
         description: 撤销时间
         type: string
+      transfertypes:
+        description: 划转类型(多个逗号分隔) - 枚举"digitaltransfertype"(1:充值 2:提现 3:转入 4:转出)
+        type: string
       userid:
         description: 用户ID
         type: integer
@@ -24588,6 +24597,10 @@ definitions:
       beforevalue:
         description: 变更前
         type: number
+      businesscodes:
+        description: 业务类型(多个逗号分隔) - 枚举digitalbusinesscode(1:充值 2:提现 3:转入 4:转出 5:现货交易
+          6:现货交易手续费 7:提现手续费...)
+        type: string
       changevalue:
         description: 变更值
         type: number
@@ -25491,8 +25504,7 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        allOf:
-        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -25516,7 +25528,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 委托价格
+        description: 期初均价
         type: number
       orderqty:
         description: 委托数量
@@ -25567,7 +25579,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 转让数量(数量)
+        description: 期初均价
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -25917,7 +25929,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 冻结数量
+        description: 期初均价
         type: number
       goodscode:
         description: 商品代码
@@ -25944,7 +25956,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 持仓数量
+        description: 期初均价
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -25962,7 +25974,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 建仓数量
+        description: 期初均价
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -26295,12 +26307,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
@@ -26340,6 +26352,9 @@ definitions:
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
         type: string
+      tradeModes:
+        description: 过滤交易模式列表,格式 10,53
+        type: string
       tradeamount:
         description: 成交金额
         type: number
@@ -26349,9 +26364,6 @@ definitions:
       tradeid:
         description: 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
         type: string
-      trademodes:
-        description: 过滤交易模式列表,格式 10,53
-        type: string
       tradetime:
         description: 交易时间
         type: string
@@ -27257,13 +27269,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 挂牌价格
+        description: 期初均价
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 履约保证金比例
+        description: 期初均价
         type: number
       marketid:
         description: 市场ID
@@ -27490,7 +27502,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 成交均价
+        description: 期初均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -27678,7 +27690,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 交割均价 = 交割金额 / 交割数量
+        description: 期初均价
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -27771,7 +27783,7 @@ definitions:
         description: 交易合约交割价
         type: number
       xgoodsamount:
-        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
+        description: 期初均价
         type: number
       xgoodscode:
         description: 商品代码
@@ -28436,7 +28448,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 步骤值
+        description: 期初均价
         type: number
       templateid:
         description: 履约计划模板ID
@@ -28671,7 +28683,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 挂牌金额 = 委托数量 * 固定价或升贴水
+        description: 期初均价
         type: number
       bannerpicurl:
         description: Banner图
@@ -28716,10 +28728,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 冻结手续费
+        description: 期初均价
         type: number
       freezemargin:
-        description: 冻结保证金(保证金)
+        description: 期初均价
         type: number
       futupricemove:
         description: 期货升贴水
@@ -28746,7 +28758,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 保证金设置值(履约保证金)
+        description: 期初均价
         type: number
       marketid:
         description: 市场ID
@@ -28927,7 +28939,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 起摘数量
+        description: 期初均价
         type: number
       deliverymonth:
         description: 交收月
@@ -29245,7 +29257,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 剩余款(待支付金额)
+        description: 期初均价
         type: number
       userid:
         description: 用户id
@@ -29409,7 +29421,7 @@ definitions:
         description: 步骤类型名称
         type: string
     type: object
-  models.WrPerformanceTemplate:
+  models.WrPerformanceTemplateEx:
     properties:
       autoid:
         description: AutoID 模板id
@@ -29420,6 +29432,11 @@ definitions:
       creatorid:
         description: 创建人
         type: integer
+      lstStep:
+        description: 步骤信息列表
+        items:
+          $ref: '#/definitions/models.WrGoodsPerformanceStep'
+        type: array
       paymenttype:
         description: 支付方式 - 1:冻结 2:扣款
         type: integer
@@ -29437,16 +29454,6 @@ 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:
@@ -29662,7 +29669,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 起摘数量
+        description: 期初均价
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -29764,10 +29771,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 日成交金额(当日单方向成交金额)
+        description: 期初均价
         type: number
       tradeqty:
-        description: 日成交数量(当日单方向成交数量)
+        description: 期初均价
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -29894,7 +29901,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 未结费用
+        description: 期初均价
         type: number
       updatetime:
         description: 更新时间
@@ -30363,7 +30370,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 委托价格
+        description: 期初均价
         type: number
       orderqty:
         description: 委托数量
@@ -32735,12 +32742,10 @@ definitions:
   tencent.CreateFlowByTemplateDirectlyReq:
     properties:
       organizationInfo:
-        allOf:
-        - $ref: '#/definitions/tencent.OrganizationInfo'
+        $ref: '#/definitions/tencent.OrganizationInfo'
         description: 签署企业信息,用户类型为企业时必填
       personInfo:
-        allOf:
-        - $ref: '#/definitions/tencent.PersonInfo'
+        $ref: '#/definitions/tencent.PersonInfo'
         description: 签署人信息,用户类型为个人时必填
       userESignRecordID:
         description: 用户电子签记录表ID 只有当前状态是1和4的电子签记录才能发起合同签署
@@ -32864,8 +32869,7 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        allOf:
-        - $ref: '#/definitions/models.Loginaccount'
+        $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -32878,12 +32882,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: 用户姓名
@@ -38320,13 +38322,11 @@ 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
@@ -38963,7 +38963,6 @@ paths:
         required: true
         type: integer
       - description: 定金比例(选中比例)
-        format: float64
         in: query
         name: depositrate
         required: true
@@ -39853,19 +39852,16 @@ 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

+ 22 - 15
models/wallet.go

@@ -3,16 +3,21 @@ package models
 import (
 	"mtp2_if/db"
 	"mtp2_if/utils"
+	"time"
 )
 
 type DigitalWalletAddress struct {
-	ID               int64  `json:"id" xorm:"ID"`                                                                        // 地址ID
-	DIGITALACCOUNTID int64  `json:"digitalaccountid" xorm:"DIGITALACCOUNTID" form:"digitalaccountid" binding:"required"` // 数字账户ID
-	CHANNEL_CODE     string `json:"channelcode" xorm:"CHANNEL_CODE"`                                                     // 渠道代码
-	ADDR_TYPE        int32  `json:"addrtype" xorm:"ADDR_TYPE"`                                                           // 地址类型:1-充值;2-提现
-	CHAIN_CODE       string `json:"chaincode" xorm:"CHAIN_CODE"`                                                         // 链代码(如BTC,ETH)
-	ADDRESS          string `json:"address" xorm:"ADDRESS"`                                                              // 区块链地址
-	MEMO             string `json:"memo" xorm:"MEMO"`                                                                    // 地址备注(某些链需要)
+	ID               int64     `json:"id" xorm:"ID"`                                                                        // 地址ID
+	DIGITALACCOUNTID int64     `json:"digitalaccountid" xorm:"DIGITALACCOUNTID" form:"digitalaccountid" binding:"required"` // 数字账户ID
+	CHANNEL_CODE     string    `json:"channel_code" xorm:"CHANNEL_CODE"`                                                    // 渠道代码
+	ADDR_TYPE        int32     `json:"addr_type" xorm:"ADDR_TYPE"`                                                          // 地址类型:1-充值;2-提现
+	CHAIN_ID         string    `json:"chain_id" xorm:"CHAIN_ID"`                                                            // 链代码(如BTC,ETH)
+	ADDRESS          string    `json:"address" xorm:"ADDRESS"`                                                              // 区块链地址
+	MEMO             string    `json:"memo" xorm:"MEMO"`                                                                    // 地址备注(某些链需要)
+	STATUS           int32     `json:"status" xorm:"STATUS"`                                                                // 状态:0-禁用;1-启用
+	CREATE_TIME      time.Time `json:"create_time" xorm:"CREATE_TIME"`                                                      // 创建时间
+	UPDATE_TIME      time.Time `json:"update_time" xorm:"UPDATE_TIME"`                                                      // 修改时间
+	TOKEN_ID         string    `json:"token_id" xorm:"TOKEN_ID"`                                                            // 代币ID(充值类型必填)
 }
 
 func (r *DigitalWalletAddress) calc() {
@@ -22,15 +27,17 @@ func (r *DigitalWalletAddress) calc() {
 func (r *DigitalWalletAddress) buildSql() string {
 	var sqlId utils.SQLVal = `
 	SELECT 
-		t.ID,
+		t.ID              ,
 		t.DIGITALACCOUNTID,
-		t.CHANNEL_CODE,
-		t.ADDR_TYPE,
-		t.CHAIN_CODE,
-		t.ADDRESS,
-		t.MEMO,
-		t.STATUS,
-		t.CREATE_TIME 
+		t.CHANNEL_CODE    ,
+		t.ADDR_TYPE       ,
+		t.CHAIN_ID        ,
+		t.ADDRESS         ,
+		t.MEMO            ,
+		t.STATUS          ,
+		t.CREATE_TIME     ,
+		t.UPDATE_TIME     ,
+		t.TOKEN_ID        
 	FROM WALLET_ADDRESS t 
 	WHERE t.DIGITALACCOUNTID = %v  
 	`

Some files were not shown because too many files changed in this diff