增加接口 /Wallet/QueryWalletAddress

controllers/digital/queryDigital.go

@@ -8,17 +8,17 @@ import (
 )
 
 // QueryTaaccountDigitals
-// @Summary 获取用户现货账户列表
+// @Summary  获取用户现货账户列表
 // @Produce  json
 // @accept   application/json
 // @Security ApiKeyAuth
-// @Param   userid 				query    int true 	"用户ID"
-// @Param   currencyids 			query    string false 	"币种ID(多个逗号分隔)"
-// @Param   digitalaccountid 	query    string false 	"数字账户ID"
-// @Success 200    {array}  models.Taaccountdigital
-// @Failure 500    {object} app.Response
-// @Router  /Digital/QueryTaaccountDigitals [post]
-// @Tags    数字现货账户
+// @Param    userid                                       query  int   true  "用户ID"
+// @Param    currencyids                            query string false      "币种ID(多个逗号分隔)"
+// @Param    digitalaccountid          query string false        "数字账户ID"
+// @Success  200              {array}  models.Taaccountdigital
+// @Failure  500              {object} app.Response
+// @Router   /Digital/QueryTaaccountDigitals [post]
+// @Tags     数字现货账户
 func QueryTaaccountDigitals(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.Taaccountdigital{}
@@ -27,19 +27,19 @@ func QueryTaaccountDigitals(c *gin.Context) {
 }
 
 // QueryTaaccountDigitalChangeApplys
-// @Summary 获取数字账户变更申请表
+// @Summary  获取数字账户变更申请表
 // @Produce  json
 // @accept   application/json
 // @Security ApiKeyAuth
-// @Param   digitalaccountid 	query    string true 	"数字账户ID"
-// @Param   applydate 			query    string false 	"申请日期(yyyyMMdd)"
-// @Param   transfertypes 		query    string 	false 	"划转类型(多个逗号分隔) - 枚举digitaltransfertype(1:充值 2:提现 3:转入 4:转出)"
-// @Param    page        query    int    false "页码"
-// @Param    pagesize    query    int    false "每页条数"
-// @Success 200    {array}  models.Taaccountdigitalchangeapply
-// @Failure 500    {object} app.Response
-// @Router  /Digital/QueryTaaccountDigitalChangeApplys [post]
-// @Tags    数字现货账户
+// @Param    digitalaccountid          query string true          "数字账户ID"
+// @Param    applydate                              query  string false  "申请日期(yyyyMMdd)"
+// @Param    transfertypes                   query  string        false  "划转类型(多个逗号分隔) - 枚举digitaltransfertype(1:充值 2:提现 3:转入 4:转出)"
+// @Param    page             query    int   false  "页码"
+// @Param    pagesize         query    int   false  "每页条数"
+// @Success  200              {array}  models.Taaccountdigitalchangeapply
+// @Failure  500              {object} app.Response
+// @Router   /Digital/QueryTaaccountDigitalChangeApplys [post]
+// @Tags     数字现货账户
 func QueryTaaccountDigitalChangeApplys(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.Taaccountdigitalchangeapply{}
@@ -48,19 +48,19 @@ func QueryTaaccountDigitalChangeApplys(c *gin.Context) {
 }
 
 // QueryTaaccountDigitalLogs
-// @Summary 获取用户现货账户流水表
+// @Summary  获取用户现货账户流水表
 // @Produce  json
 // @accept   application/json
 // @Security ApiKeyAuth
-// @Param   digitalaccountid 	query    string true 	"数字账户ID"
-// @Param   tradedate 			query    string false 	"交易日(yyyyMMdd)"
-// @Param   businesscodes 		query    string false 	"业务类型(多个逗号分隔) - 枚举digitalbusinesscode(1:充值 2:提现 3:转入 4:转出 5:现货交易 6:现货交易手续费 7:提现手续费...)"
-// @Param    page        query    int    false "页码"
-// @Param    pagesize    query    int    false "每页条数"
-// @Success 200    {array}  models.Taaccountdigitallog
-// @Failure 500    {object} app.Response
-// @Router  /Digital/QueryTaaccountDigitalLogs [post]
-// @Tags    数字现货账户
+// @Param    digitalaccountid          query string true          "数字账户ID"
+// @Param    tradedate                              query  string false  "交易日(yyyyMMdd)"
+// @Param    businesscodes                   query  string false        "业务类型(多个逗号分隔) - 枚举digitalbusinesscode(1:充值 2:提现 3:转入 4:转出 5:现货交易 6:现货交易手续费 7:提现手续费...)"
+// @Param    page             query    int   false  "页码"
+// @Param    pagesize         query    int   false  "每页条数"
+// @Success  200              {array}  models.Taaccountdigitallog
+// @Failure  500              {object} app.Response
+// @Router   /Digital/QueryTaaccountDigitalLogs [post]
+// @Tags     数字现货账户
 func QueryTaaccountDigitalLogs(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.Taaccountdigitallog{}
@@ -69,21 +69,21 @@ func QueryTaaccountDigitalLogs(c *gin.Context) {
 }
 
 // QueryDigitalTradeOrderDetails
-// @Summary 获取数字现货交易委托表
+// @Summary  获取数字现货交易委托表
 // @Produce  json
 // @accept   application/json
 // @Security ApiKeyAuth
-// @Param   userid 				query    string true 	"用户ID"
-// @Param   digitalaccountid 	query    string false 	"数字账户ID"
-// @Param   goodsid 			query    int	false 	"商品ID"
-// @Param   tradedate 			query    string false 	"交易日(yyyyMMdd)"
-// @Param   orderstatuses 		query    string false 	"委托状态(多个逗号分隔) 参考枚举orderstatus"
-// @Param    page        query    int    false "页码"
-// @Param    pagesize    query    int    false "每页条数"
-// @Success 200    {array}  models.DigitaltradeOrderdetail
-// @Failure 500    {object} app.Response
-// @Router  /Digital/QueryDigitalTradeOrderDetails [post]
-// @Tags    数字现货账户
+// @Param    userid                                        query  string true  "用户ID"
+// @Param    digitalaccountid          query string false         "数字账户ID"
+// @Param    goodsid                                query  int    false  "商品ID"
+// @Param    tradedate                              query  string false  "交易日(yyyyMMdd)"
+// @Param    orderstatuses                   query  string false        "委托状态(多个逗号分隔) 参考枚举orderstatus"
+// @Param    page             query    int   false  "页码"
+// @Param    pagesize         query    int   false  "每页条数"
+// @Success  200              {array}  models.DigitaltradeOrderdetail
+// @Failure  500              {object} app.Response
+// @Router   /Digital/QueryDigitalTradeOrderDetails [post]
+// @Tags     数字现货账户
 func QueryDigitalTradeOrderDetails(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.DigitaltradeOrderdetail{}
@@ -92,20 +92,20 @@ func QueryDigitalTradeOrderDetails(c *gin.Context) {
 }
 
 // QueryDigitalTradeTradeDetails
-// @Summary 获取数字现货交易成交表
+// @Summary  获取数字现货交易成交表
 // @Produce  json
 // @accept   application/json
 // @Security ApiKeyAuth
-// @Param   userid 				query    string true 	"用户ID"
-// @Param   digitalaccountid 	query    string false 	"数字账户ID"
-// @Param   goodsid 			query    int	false 	"商品ID"
-// @Param   tradedate 			query    string false 	"交易日(yyyyMMdd)"
-// @Param    page        query    int    false "页码"
-// @Param    pagesize    query    int    false "每页条数"
-// @Success 200    {array}  models.DigitaltradeTradedetail
-// @Failure 500    {object} app.Response
-// @Router  /Digital/QueryDigitalTradeTradeDetails [post]
-// @Tags    数字现货账户
+// @Param    userid                                       query  string true  "用户ID"
+// @Param    digitalaccountid          query string false        "数字账户ID"
+// @Param    goodsid                                query int    false  "商品ID"
+// @Param    tradedate                              query string false  "交易日(yyyyMMdd)"
+// @Param    page             query    int   false  "页码"
+// @Param    pagesize         query    int   false  "每页条数"
+// @Success  200              {array}  models.DigitaltradeTradedetail
+// @Failure  500              {object} app.Response
+// @Router   /Digital/QueryDigitalTradeTradeDetails [post]
+// @Tags     数字现货账户
 func QueryDigitalTradeTradeDetails(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.DigitaltradeTradedetail{}

controllers/guangzuan/tradeService.go

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

controllers/order/order.go

@@ -581,9 +581,9 @@ func (r *QueryHisTradeOrderDetailRsp) calc() {
 // @Param    startDate   query    string false "开始时间 - 闭区间，格式：yyyy-MM-dd"
 // @Param    endDate     query    string false "结束时间 - 闭区间，格式：yyyy-MM-dd"
 // @Param    goodsID     query    int    false "商品ID"
-// @Param    page      query    int    false "页码"
-// @Param    pagesize  query    int    false "每页条数"
-// @Param    pageflag  query    int    false "分页标志 0-page从0开始 1-page从1开始"
+// @Param    page        query    int    false "页码"
+// @Param    pagesize    query    int    false "每页条数"
+// @Param    pageflag    query    int    false "分页标志 0-page从0开始 1-page从1开始"
 // @Success  200         {object} QueryHisTradeOrderDetailRsp
 // @Failure  500         {object} app.Response
 // @Router   /Order/QueryHisTradeOrderDetail [get]

controllers/sbyj/order.go

@@ -15,11 +15,11 @@ import (
 // @Summary  获取我的订单列表
 // @Produce  json
 // @Security ApiKeyAuth
-// @Param    userId  query    int true  "用户ID"
-// @Param    accountId  query string false "资金账户"
-// @Param    goodsId query    int false "商品ID"
-// @Success  200     {array}  models.RedisTradeHolderDetailEx
-// @Failure  500     {object} app.Response
+// @Param    userId    query    int    true  "用户ID"
+// @Param    accountId query    string false "资金账户"
+// @Param    goodsId   query    int    false "商品ID"
+// @Success  200       {array}  models.RedisTradeHolderDetailEx
+// @Failure  500       {object} app.Response
 // @Router   /sbyj/GetMyOrders [get]
 // @Tags     订单系统
 func GetMyOrders(c *gin.Context) {

controllers/wallet/address.go

@@ -0,0 +1,24 @@
+package wallet
+
+import (
+	"mtp2_if/global/app"
+	"mtp2_if/models"
+
+	"github.com/gin-gonic/gin"
+)
+
+// QueryMyRefer
+// @Summary  查询我的推荐列表
+// @Produce  json
+// @Security ApiKeyAuth
+// @Param    digitalaccountid query    int true "数字账户ID"
+// @Success  200              {array}  models.DigitalWalletAddress
+// @Failure  500              {object} app.Response
+// @Router   /Wallet/QueryWalletAddress [get]
+// @Tags     钱包
+func QueryWalletAddress(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.DigitalWalletAddress{}
+	a.DoBindReq(&m)
+	a.DoGetDataI(&m)
+}

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:
@@ -4957,6 +4943,32 @@ definitions:
         description: 顺序
         type: integer
     type: object
+  models.DigitalWalletAddress:
+    properties:
+      address:
+        description: 区块链地址
+        type: string
+      addrtype:
+        description: 地址类型：1-充值；2-提现
+        type: integer
+      chaincode:
+        description: 链代码(如BTC,ETH)
+        type: string
+      channelcode:
+        description: 渠道代码
+        type: string
+      digitalaccountid:
+        description: 数字账户ID
+        type: integer
+      id:
+        description: 地址ID
+        type: integer
+      memo:
+        description: 地址备注(某些链需要)
+        type: string
+    required:
+    - digitalaccountid
+    type: object
   models.DigitaltradeOrderdetail:
     properties:
       baseaccountid:
@@ -6030,7 +6042,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期末均价
+        description: 期初均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -6039,7 +6051,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 参考市值(期末市值)
+        description: 期初均价
         type: number
       curqty:
         description: 期末量
@@ -6057,7 +6069,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 参考市价(最新价)
+        description: 期初均价
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -6081,7 +6093,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 浮动损益
+        description: 期初均价
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -6117,7 +6129,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 今日采购均价
+        description: 期初均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -6132,7 +6144,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 今日销售均价
+        description: 期初均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -8312,7 +8324,7 @@ definitions:
         description: 合同类型 1：采购 -1：销售
         type: integer
       convertratio:
-        description: 折算系数
+        description: 期初均价
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -8330,16 +8342,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: 交易对手方(个人:用户名称 企业:简称)
@@ -8357,64 +8369,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: 更新时间
@@ -8423,7 +8435,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 增值税率
+        description: 期初均价
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -8831,7 +8843,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 平仓均价
+        description: 期初均价
         type: number
       closepl:
         description: 平仓损益
@@ -8882,7 +8894,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期末持仓量
+        description: 期初均价
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -8906,13 +8918,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 开仓均价
+        description: 期初均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初持仓量
+        description: 期初均价
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -8945,7 +8957,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 今平仓量
+        description: 期初均价
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=（期末持仓量 - 期初持仓量）* 合约乘数)
@@ -8957,7 +8969,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 今开仓量
+        description: 期初均价
         type: number
       userid:
         description: 账户所属用户ID
@@ -10262,8 +10274,7 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpRoleMenu'
+        $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -10490,8 +10501,7 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpTaAccountM'
+        $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -12092,8 +12102,7 @@ definitions:
   models.GetTodayAccountConfigInfoRsp:
     properties:
       riskRatioType:
-        allOf:
-        - $ref: '#/definitions/models.Riskratiotype'
+        $ref: '#/definitions/models.Riskratiotype'
         description: 风险率类型表
       todayAccountMargins:
         description: 今日账户保证金表
@@ -15611,12 +15620,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
@@ -15650,12 +15659,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
@@ -22369,8 +22378,7 @@ definitions:
         description: 可退定金
         type: number
       tHDetailEx:
-        allOf:
-        - $ref: '#/definitions/models.TradeHolderDetailEx'
+        $ref: '#/definitions/models.TradeHolderDetailEx'
         description: 交易持仓扩展表记录
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
@@ -22390,7 +22398,7 @@ definitions:
     type: object
   models.ReportBankAccountOutInLog:
     properties:
-      accountid:
+      accountId:
         description: 资金账户
         type: integer
       amount:
@@ -22412,7 +22420,7 @@ definitions:
       executetypedisplay:
         description: 申请类型
         type: string
-      reporttype:
+      reportType:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradedate:
@@ -22422,8 +22430,8 @@ definitions:
         description: 更新时间
         type: string
     required:
-    - accountid
-    - reporttype
+    - accountId
+    - reportType
     - tradedate
     type: object
   models.ReportReckonDayPosition:
@@ -22461,13 +22469,13 @@ definitions:
       reckondate:
         description: 日照日期(yyyyMMdd)
         type: string
-      reporttype:
+      reportType:
         description: 报表类型 日报表-1 月报表-2
         type: integer
     required:
     - accountid
     - reckondate
-    - reporttype
+    - reportType
     type: object
   models.ReportReckondaytaaccount:
     properties:
@@ -22743,7 +22751,7 @@ definitions:
       histradedate:
         description: 查询日期 日报表-yyyyMMdd 月报表-yyyyMM
         type: string
-      reporttype:
+      reportType:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradeamount:
@@ -22764,7 +22772,7 @@ definitions:
     required:
     - accountid
     - histradedate
-    - reporttype
+    - reportType
     type: object
   models.Reporttaaccount:
     properties:
@@ -23878,8 +23886,7 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -24036,8 +24043,7 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -24216,8 +24222,7 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -25453,8 +25458,7 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        allOf:
-        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -25478,7 +25482,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 委托价格
+        description: 期初均价
         type: number
       orderqty:
         description: 委托数量
@@ -25529,7 +25533,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 转让数量(数量)
+        description: 期初均价
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -25879,7 +25883,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 冻结数量
+        description: 期初均价
         type: number
       goodscode:
         description: 商品代码
@@ -25906,7 +25910,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 持仓数量
+        description: 期初均价
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -25924,7 +25928,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 建仓数量
+        description: 期初均价
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -26231,12 +26235,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
@@ -26276,6 +26280,9 @@ definitions:
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
         type: string
+      tradeModes:
+        description: 过滤交易模式列表，格式 10,53
+        type: string
       tradeamount:
         description: 成交金额
         type: number
@@ -26285,9 +26292,6 @@ definitions:
       tradeid:
         description: 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
         type: string
-      trademodes:
-        description: 过滤交易模式列表，格式 10,53
-        type: string
       tradetime:
         description: 交易时间
         type: string
@@ -27193,13 +27197,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 挂牌价格
+        description: 期初均价
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 履约保证金比例
+        description: 期初均价
         type: number
       marketid:
         description: 市场ID
@@ -27334,7 +27338,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 成交均价
+        description: 期初均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -27522,7 +27526,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 交割均价 = 交割金额 / 交割数量
+        description: 期初均价
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -27615,7 +27619,7 @@ definitions:
         description: 交易合约交割价
         type: number
       xgoodsamount:
-        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
+        description: 期初均价
         type: number
       xgoodscode:
         description: 商品代码
@@ -28274,7 +28278,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 步骤值
+        description: 期初均价
         type: number
       templateid:
         description: 履约计划模板ID
@@ -28509,7 +28513,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 挂牌金额 = 委托数量 * 固定价或升贴水
+        description: 期初均价
         type: number
       bannerpicurl:
         description: Banner图
@@ -28554,10 +28558,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 冻结手续费
+        description: 期初均价
         type: number
       freezemargin:
-        description: 冻结保证金(保证金)
+        description: 期初均价
         type: number
       futupricemove:
         description: 期货升贴水
@@ -28584,7 +28588,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 保证金设置值(履约保证金)
+        description: 期初均价
         type: number
       marketid:
         description: 市场ID
@@ -28765,7 +28769,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 起摘数量
+        description: 期初均价
         type: number
       deliverymonth:
         description: 交收月
@@ -29083,7 +29087,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 剩余款(待支付金额)
+        description: 期初均价
         type: number
       userid:
         description: 用户id
@@ -29247,7 +29251,7 @@ definitions:
         description: 步骤类型名称
         type: string
     type: object
-  models.WrPerformanceTemplate:
+  models.WrPerformanceTemplateEx:
     properties:
       autoid:
         description: AutoID 模板id
@@ -29258,6 +29262,11 @@ definitions:
       creatorid:
         description: 创建人
         type: integer
+      lstStep:
+        description: 步骤信息列表
+        items:
+          $ref: '#/definitions/models.WrGoodsPerformanceStep'
+        type: array
       paymenttype:
         description: 支付方式 - 1:冻结 2:扣款
         type: integer
@@ -29275,16 +29284,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:
@@ -29500,7 +29499,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 起摘数量
+        description: 期初均价
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -29602,10 +29601,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 日成交金额(当日单方向成交金额)
+        description: 期初均价
         type: number
       tradeqty:
-        description: 日成交数量(当日单方向成交数量)
+        description: 期初均价
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -29732,7 +29731,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 未结费用
+        description: 期初均价
         type: number
       updatetime:
         description: 更新时间
@@ -30201,7 +30200,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 委托价格
+        description: 期初均价
         type: number
       orderqty:
         description: 委托数量
@@ -32573,12 +32572,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的电子签记录才能发起合同签署
@@ -32702,8 +32699,7 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        allOf:
-        - $ref: '#/definitions/models.Loginaccount'
+        $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -32716,12 +32712,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: 用户姓名
@@ -38158,13 +38152,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
@@ -38801,7 +38793,6 @@ paths:
         required: true
         type: integer
       - description: 定金比例（选中比例）
-        format: float64
         in: query
         name: depositrate
         required: true
@@ -39691,19 +39682,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
@@ -46146,6 +46134,32 @@ paths:
       tags:
       - 仓单贸易
       - 仓单贸易
+  /Wallet/QueryWalletAddress:
+    get:
+      parameters:
+      - description: 数字账户ID
+        in: query
+        name: digitalaccountid
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.DigitalWalletAddress'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 查询我的推荐列表
+      tags:
+      - 钱包
   /WrTrade2/InsertXhcpSellBackApply:
     post:
       parameters:

models/ori.go

@@ -1426,3 +1426,21 @@ type QueryUserScoreDetailRsp struct {
 
 	SCORETYPENAME string `json:"scoretypename" xorm:"SCORETYPENAME"` // 积分类型名称
 }
+
+// Walletaddress 钱包充值提现地址表
+type Walletaddress struct {
+	ID               int64      `json:"id" xorm:"ID"`                             // 地址ID
+	DIGITALACCOUNTID int64      `json:"digitalaccountid" xorm:"DIGITALACCOUNTID"` // 数字账户ID
+	CHANNEL_CODE     string     `json:"channel_code" xorm:"CHANNEL_CODE"`         // 渠道代码
+	ADDR_TYPE        int32      `json:"addr_type" xorm:"ADDR_TYPE"`               // 地址类型：1-充值；2-提现
+	CHAIN_CODE       string     `json:"chain_code" xorm:"CHAIN_CODE"`             // 链代码(如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"`           // 创建时间
+}
+
+// TableName is WALLET_ADDRESS
+func (r *Walletaddress) TableName() string {
+	return "WALLET_ADDRESS"
+}

models/wallet.go

@@ -0,0 +1,50 @@
+package models
+
+import (
+	"mtp2_if/db"
+	"mtp2_if/utils"
+)
+
+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"`                                                                    // 地址备注(某些链需要)
+}
+
+func (r *DigitalWalletAddress) calc() {
+
+}
+
+func (r *DigitalWalletAddress) buildSql() string {
+	var sqlId utils.SQLVal = `
+	SELECT 
+		t.ID,
+		t.DIGITALACCOUNTID,
+		t.CHANNEL_CODE,
+		t.ADDR_TYPE,
+		t.CHAIN_CODE,
+		t.ADDRESS,
+		t.MEMO,
+		t.STATUS,
+		t.CREATE_TIME 
+	FROM WALLET_ADDRESS t 
+	WHERE t.DIGITALACCOUNTID = %v  
+	`
+	sqlId.FormatParam(r.DIGITALACCOUNTID)
+
+	return sqlId.String()
+}
+
+// GetDataEx 从数据库中查询数据
+func (r *DigitalWalletAddress) GetDataEx() (interface{}, error) {
+	sData := make([]DigitalWalletAddress, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, err
+}

routers/router.go

@@ -37,6 +37,7 @@ import (
 	"mtp2_if/controllers/trade"
 	"mtp2_if/controllers/tradexx"
 	"mtp2_if/controllers/user"
+	"mtp2_if/controllers/wallet"
 	"mtp2_if/controllers/wrTrade2"
 	"mtp2_if/controllers/wrtrade"
 	"mtp2_if/controllers/zhongrong"
@@ -941,6 +942,12 @@ func InitRouter() *gin.Engine {
 		digitalR.Use(token.Auth()).POST("QueryDigitalTradeTradeDetails", digital.QueryDigitalTradeTradeDetails)
 	}
 
+	walletR := apiR.Group("Wallet")
+	walletR.Use()
+	{
+		walletR.Use(token.Auth()).GET("QueryWalletAddress", wallet.QueryWalletAddress)
+	}
+
 	return r
 }