/sbyj/GetMyOrders(获取我的订单列表)：添加查询条件”accountId";

README.md

@@ -16,6 +16,10 @@ go build .
 
 <http://127.0.0.1:8080/swagger/index.html>
 
+更新swagger文档
+go install github.com/swaggo/swag/cmd/swag@latest
+swag init
+
 ## 商品盘面获取配置
 
 MySQLSetting 节点

controllers/sbyj/goods.go

@@ -70,6 +70,7 @@ func GetTouristGoods(c *gin.Context) {
 }
 
 type GetMyOrdersReq struct {
-	GoodsId int `form:"goodsId"`                   // 商品ID
-	UserId  int `form:"userId" binding:"required"` // 用户ID
+	GoodsId   int    `form:"goodsId"`                   // 商品ID
+	UserId    int    `form:"userId" binding:"required"` // 用户ID
+	AccountId uint64 `form:"accountId"`                 // 资金账户Id
 }

controllers/sbyj/order.go

@@ -15,6 +15,7 @@ import (
 // @Produce  json
 // @Security ApiKeyAuth
 // @Param    userId  query    int true  "用户ID"
+// @Param    accountId  query int false "资金账户"
 // @Param    goodsId query    int false "商品ID"
 // @Success  200     {array}  models.RedisTradeHolderDetailEx
 // @Failure  500     {object} app.Response
@@ -33,7 +34,7 @@ func GetMyOrders(c *gin.Context) {
 
 	// 获取数据
 	d := models.RedisTradeHolderDetailEx{}
-	rsp, err := d.GetDataEx(req.UserId, req.GoodsId)
+	rsp, err := d.GetDataEx(req.UserId, req.GoodsId, req.AccountId)
 	if err != nil {
 		// 查询失败
 		logger.GetLogger().Errorf("GetMyOrders failed: %s", err.Error())

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:
@@ -5792,7 +5806,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期初均价
+        description: 期末均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -5801,7 +5815,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 期初均价
+        description: 参考市值(期末市值)
         type: number
       curqty:
         description: 期末量
@@ -5819,7 +5833,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 期初均价
+        description: 参考市价(最新价)
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -5843,7 +5857,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 期初均价
+        description: 浮动损益
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -5879,7 +5893,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 期初均价
+        description: 今日采购均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -5894,7 +5908,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 期初均价
+        description: 今日销售均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -8074,7 +8088,7 @@ definitions:
         description: 合同类型 1：采购 -1：销售
         type: integer
       convertratio:
-        description: 期初均价
+        description: 折算系数
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -8092,16 +8106,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: 交易对手方(个人:用户名称 企业:简称)
@@ -8119,64 +8133,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: 更新时间
@@ -8185,7 +8199,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 期初均价
+        description: 增值税率
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -8593,7 +8607,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 期初均价
+        description: 平仓均价
         type: number
       closepl:
         description: 平仓损益
@@ -8644,7 +8658,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期初均价
+        description: 期末持仓量
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -8668,13 +8682,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 期初均价
+        description: 开仓均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初均价
+        description: 期初持仓量
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -8707,7 +8721,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 期初均价
+        description: 今平仓量
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=（期末持仓量 - 期初持仓量）* 合约乘数)
@@ -8719,7 +8733,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 期初均价
+        description: 今开仓量
         type: number
       userid:
         description: 账户所属用户ID
@@ -9625,9 +9639,33 @@ definitions:
       sellshippingfeevalue:
         description: 卖交收运费值
         type: number
+      slratiodefault:
+        description: 止损默认比例
+        type: number
+      slratiodown:
+        description: 止损比例下限
+        type: number
+      slratioup:
+        description: 止损比例上限
+        type: number
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
         type: string
+      tpratiodefault:
+        description: 止盈默认比例
+        type: number
+      tpratiodown:
+        description: 止盈比例下限
+        type: number
+      tpratioup:
+        description: 止盈比例上限
+        type: number
+      tpslflag:
+        description: 是否开启止盈止损 - 0:不开启 1:开启
+        type: integer
+      tpslforceflag:
+        description: 是否强制止盈止损 - 0:不强制 1:强制
+        type: integer
       trademode:
         description: 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式
           21:竞拍-大宗式 22:受托竞价
@@ -9994,7 +10032,8 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        $ref: '#/definitions/models.ErmcpRoleMenu'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -10221,7 +10260,8 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        $ref: '#/definitions/models.ErmcpTaAccountM'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -11822,7 +11862,8 @@ definitions:
   models.GetTodayAccountConfigInfoRsp:
     properties:
       riskRatioType:
-        $ref: '#/definitions/models.Riskratiotype'
+        allOf:
+        - $ref: '#/definitions/models.Riskratiotype'
         description: 风险率类型表
       todayAccountMargins:
         description: 今日账户保证金表
@@ -12050,6 +12091,18 @@ definitions:
       goodsgroupname:
         description: 商品组名称
         type: string
+      goodsgroupnameen:
+        description: 商品组名称(英文)
+        type: string
+      goodsgroupnameth:
+        description: 商品组名称(泰文)
+        type: string
+      goodsgroupnametw:
+        description: 商品组名称(繁体)
+        type: string
+      goodsgroupnamevi:
+        description: 商品组名称(越南)
+        type: string
       goodsgroupstatus:
         description: 商品组状态 - 1:正常 2:注销
         type: integer
@@ -15328,12 +15381,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
@@ -15367,12 +15420,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
@@ -22086,7 +22139,8 @@ definitions:
         description: 可退定金
         type: number
       tHDetailEx:
-        $ref: '#/definitions/models.TradeHolderDetailEx'
+        allOf:
+        - $ref: '#/definitions/models.TradeHolderDetailEx'
         description: 交易持仓扩展表记录
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
@@ -22106,7 +22160,7 @@ definitions:
     type: object
   models.ReportBankAccountOutInLog:
     properties:
-      accountId:
+      accountid:
         description: 资金账户
         type: integer
       amount:
@@ -22128,7 +22182,7 @@ definitions:
       executetypedisplay:
         description: 申请类型
         type: string
-      reportType:
+      reporttype:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradedate:
@@ -22138,8 +22192,8 @@ definitions:
         description: 更新时间
         type: string
     required:
-    - accountId
-    - reportType
+    - accountid
+    - reporttype
     - tradedate
     type: object
   models.ReportReckonDayPosition:
@@ -22177,13 +22231,13 @@ definitions:
       reckondate:
         description: 日照日期(yyyyMMdd)
         type: string
-      reportType:
+      reporttype:
         description: 报表类型 日报表-1 月报表-2
         type: integer
     required:
     - accountid
     - reckondate
-    - reportType
+    - reporttype
     type: object
   models.ReportReckondaytaaccount:
     properties:
@@ -22459,7 +22513,7 @@ definitions:
       histradedate:
         description: 查询日期 日报表-yyyyMMdd 月报表-yyyyMM
         type: string
-      reportType:
+      reporttype:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradeamount:
@@ -22480,7 +22534,7 @@ definitions:
     required:
     - accountid
     - histradedate
-    - reportType
+    - reporttype
     type: object
   models.Reporttaaccount:
     properties:
@@ -23594,7 +23648,8 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -23751,7 +23806,8 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        allOf:
+        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -23930,7 +23986,8 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -24977,7 +25034,8 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        allOf:
+        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -25001,7 +25059,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -25052,7 +25110,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 期初均价
+        description: 转让数量(数量)
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -25402,7 +25460,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 期初均价
+        description: 冻结数量
         type: number
       goodscode:
         description: 商品代码
@@ -25429,7 +25487,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 期初均价
+        description: 持仓数量
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -25447,7 +25505,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 期初均价
+        description: 建仓数量
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -25754,12 +25812,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
@@ -25799,9 +25857,6 @@ definitions:
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
         type: string
-      tradeModes:
-        description: 过滤交易模式列表，格式 10,53
-        type: string
       tradeamount:
         description: 成交金额
         type: number
@@ -25811,6 +25866,9 @@ definitions:
       tradeid:
         description: 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
         type: string
+      trademodes:
+        description: 过滤交易模式列表，格式 10,53
+        type: string
       tradetime:
         description: 交易时间
         type: string
@@ -26715,13 +26773,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 期初均价
+        description: 挂牌价格
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 期初均价
+        description: 履约保证金比例
         type: number
       marketid:
         description: 市场ID
@@ -26856,7 +26914,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 期初均价
+        description: 成交均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -27044,7 +27102,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 期初均价
+        description: 交割均价 = 交割金额 / 交割数量
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -27137,7 +27195,7 @@ definitions:
         description: 交易合约交割价
         type: number
       xgoodsamount:
-        description: 期初均价
+        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
         type: number
       xgoodscode:
         description: 商品代码
@@ -27796,7 +27854,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 期初均价
+        description: 步骤值
         type: number
       templateid:
         description: 履约计划模板ID
@@ -28031,7 +28089,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 期初均价
+        description: 挂牌金额 = 委托数量 * 固定价或升贴水
         type: number
       bannerpicurl:
         description: Banner图
@@ -28076,10 +28134,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 期初均价
+        description: 冻结手续费
         type: number
       freezemargin:
-        description: 期初均价
+        description: 冻结保证金(保证金)
         type: number
       futupricemove:
         description: 期货升贴水
@@ -28106,7 +28164,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 期初均价
+        description: 保证金设置值(履约保证金)
         type: number
       marketid:
         description: 市场ID
@@ -28287,7 +28345,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverymonth:
         description: 交收月
@@ -28605,7 +28663,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 期初均价
+        description: 剩余款(待支付金额)
         type: number
       userid:
         description: 用户id
@@ -28769,7 +28827,7 @@ definitions:
         description: 步骤类型名称
         type: string
     type: object
-  models.WrPerformanceTemplateEx:
+  models.WrPerformanceTemplate:
     properties:
       autoid:
         description: AutoID 模板id
@@ -28780,11 +28838,6 @@ definitions:
       creatorid:
         description: 创建人
         type: integer
-      lstStep:
-        description: 步骤信息列表
-        items:
-          $ref: '#/definitions/models.WrGoodsPerformanceStep'
-        type: array
       paymenttype:
         description: 支付方式 - 1:冻结 2:扣款
         type: integer
@@ -28802,6 +28855,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:
@@ -29017,7 +29080,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -29119,10 +29182,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 期初均价
+        description: 日成交金额(当日单方向成交金额)
         type: number
       tradeqty:
-        description: 期初均价
+        description: 日成交数量(当日单方向成交数量)
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -29249,7 +29312,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 期初均价
+        description: 未结费用
         type: number
       updatetime:
         description: 更新时间
@@ -29718,7 +29781,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -32212,10 +32275,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的电子签记录才能发起合同签署
@@ -32339,7 +32404,8 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        $ref: '#/definitions/models.Loginaccount'
+        allOf:
+        - $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -32352,10 +32418,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: 用户姓名
@@ -37567,11 +37635,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
@@ -38208,6 +38278,7 @@ paths:
         required: true
         type: integer
       - description: 定金比例（选中比例）
+        format: float64
         in: query
         name: depositrate
         required: true
@@ -39097,16 +39168,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
@@ -47333,6 +47407,10 @@ paths:
         name: userId
         required: true
         type: integer
+      - description: 资金账户
+        in: query
+        name: accountId
+        type: integer
       - description: 商品ID
         in: query
         name: goodsId

models/sbyj.go

@@ -174,7 +174,7 @@ func (s RedisTradeHolderDetailExArray) Less(i, j int) bool {
 func (s RedisTradeHolderDetailExArray) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
 
 // GetDataEx 从数据库中查询数据
-func (r *RedisTradeHolderDetailEx) GetDataEx(userId int, goodsId int) (sData RedisTradeHolderDetailExArray, err error) {
+func (r *RedisTradeHolderDetailEx) GetDataEx(userId int, goodsId int, accountId uint64) (sData RedisTradeHolderDetailExArray, err error) {
 	redisCli := rediscli.GetRedisClient()
 	g := strconv.Itoa(goodsId)
 	if goodsId == 0 {
@@ -182,7 +182,7 @@ func (r *RedisTradeHolderDetailEx) GetDataEx(userId int, goodsId int) (sData Red
 	}
 
 	// 获取 userID 对应的 taaccount 信息
-	// 注意这里留了一个坑，在多资金账户情况下这个逻辑需要修改（老邓认证）
+	// 注意这里留了一个坑，在多资金账户情况下这个逻辑需要修改
 	taaccount, _ := GetTaAccountByUserID(userId)
 
 	sData = make([]RedisTradeHolderDetailEx, 0)
@@ -206,7 +206,10 @@ func (r *RedisTradeHolderDetailEx) GetDataEx(userId int, goodsId int) (sData Red
 					m.THDetailEx.OriRestockDeposit = utils.Float64Round(m.THDetailEx.OriRestockDeposit, 2)
 					m.THDetailEx.AddDepositRate = utils.Float64Round(m.THDetailEx.AddDepositRate, 4)
 
-					sData = append(sData, m)
+					// 有资金账户ID则只取该资金账户的数据
+					if accountId == 0 || (accountId != 0 && accountId == m.THDetailEx.AccountID) {
+						sData = append(sData, m)
+					}
 				}
 			}
 		}
@@ -297,6 +300,7 @@ func (r *RedisTradeHolderDetailEx) ParseFromProto(p *pb.RedisTradeHolderDetailEx
 	}
 
 	if taaccount != nil {
+		// todo: 多账户这里有问题，需要修改
 		r.Currencyid = taaccount.Currencyid
 	}
 }