|
|
@@ -130,7 +130,8 @@ func QueryInnerTradeDetail(c *gin.Context) {
|
|
|
|
|
|
// QueryArbitrageStrategyReq 查询期现套利策略表信息请求参数
|
|
|
type QueryArbitrageStrategyReq struct {
|
|
|
- AccountID int `form:"accountid" binding:"required"`
|
|
|
+ // AccountID int `form:"accountid" binding:"required"`
|
|
|
+ UserID int `form:"userid" binding:"required"`
|
|
|
GoodsGroupID int `form:"goodsgroupid"`
|
|
|
}
|
|
|
|
|
|
@@ -182,7 +183,7 @@ type QueryArbitrageStrategyRsp struct {
|
|
|
// @Summary 查询期现套利策略表信息(指定资金账户、未结束的)
|
|
|
// @Produce json
|
|
|
// @Security ApiKeyAuth
|
|
|
-// @Param accountid query int true "资金账户"
|
|
|
+// @Param userid query int true "账户ID"
|
|
|
// @Param goodsgroupid query string false "商品组ID(品种ID)"
|
|
|
// @Success 200 {object} QueryArbitrageStrategyRsp
|
|
|
// @Failure 500 {object} app.Response
|
|
|
@@ -245,7 +246,7 @@ func QueryArbitrageStrategy(c *gin.Context) {
|
|
|
t.UpdateTime
|
|
|
from ERMS2_ArbitrageStrategy t
|
|
|
left join ERMS2_ASAccount a on t.asapplyid = a.asapplyid
|
|
|
- where t.StrategyStatus = 0 and a.accountid = %d`, req.AccountID)
|
|
|
+ where t.StrategyStatus = 0 and t.userid = %d`, req.UserID)
|
|
|
if req.GoodsGroupID > 0 {
|
|
|
sql += fmt.Sprintf(" and t.GoodsGroupID = %d", req.GoodsGroupID)
|
|
|
}
|