1、合仓
This commit is contained in:
@ -467,8 +467,7 @@ func (e FutRestApi) OrderPlace(orm *gorm.DB, params FutOrderPlace) error {
|
||||
if err2 != nil {
|
||||
return err2
|
||||
}
|
||||
var paramsMaps map[string]string
|
||||
paramsMaps = map[string]string{
|
||||
paramsMaps := map[string]string{
|
||||
"symbol": params.Symbol,
|
||||
"side": params.Side,
|
||||
"quantity": params.Quantity.String(),
|
||||
@ -519,18 +518,11 @@ func (e FutRestApi) OrderPlace(orm *gorm.DB, params FutOrderPlace) error {
|
||||
paramsMaps["positionSide"] = "LONG"
|
||||
}
|
||||
}
|
||||
var apiUserInfo DbModels.LineApiUser
|
||||
err := orm.Model(&DbModels.LineApiUser{}).Where("id = ?", params.ApiId).Find(&apiUserInfo).Error
|
||||
apiUserInfo, err := GetApiInfo(params.ApiId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var client *helper.BinanceClient
|
||||
|
||||
if apiUserInfo.UserPass == "" {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "", apiUserInfo.IpAddress)
|
||||
} else {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "socks5", apiUserInfo.UserPass+"@"+apiUserInfo.IpAddress)
|
||||
}
|
||||
client := GetClient(&apiUserInfo)
|
||||
_, statusCode, err := client.SendFuturesRequestAuth("/fapi/v1/order", "POST", paramsMaps)
|
||||
if err != nil {
|
||||
var dataMap map[string]interface{}
|
||||
@ -662,12 +654,7 @@ func getSymbolHolde(e FutRestApi, apiInfo *DbModels.LineApiUser, symbol string,
|
||||
}
|
||||
|
||||
func (e FutRestApi) GetPositionV3(apiUserInfo *DbModels.LineApiUser, symbol string) ([]PositionRisk, error) {
|
||||
var client *helper.BinanceClient
|
||||
if apiUserInfo.UserPass == "" {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "", apiUserInfo.IpAddress)
|
||||
} else {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "socks5", apiUserInfo.UserPass+"@"+apiUserInfo.IpAddress)
|
||||
}
|
||||
client := GetClient(apiUserInfo)
|
||||
params := map[string]string{
|
||||
"symbol": symbol,
|
||||
"recvWindow": "5000",
|
||||
@ -736,12 +723,7 @@ func (e FutRestApi) ClosePosition(symbol string, orderSn string, quantity decima
|
||||
params["timeInForce"] = "GTC"
|
||||
}
|
||||
|
||||
var client *helper.BinanceClient
|
||||
if apiUserInfo.UserPass == "" {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "", apiUserInfo.IpAddress)
|
||||
} else {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "socks5", apiUserInfo.UserPass+"@"+apiUserInfo.IpAddress)
|
||||
}
|
||||
client := GetClient(&apiUserInfo)
|
||||
|
||||
resp, _, err := client.SendFuturesRequestAuth(endpoint, "POST", params)
|
||||
if err != nil {
|
||||
@ -781,12 +763,7 @@ func (e FutRestApi) CancelFutOrder(apiUserInfo DbModels.LineApiUser, symbol stri
|
||||
"symbol": symbol, //交易对
|
||||
"origClientOrderId": newClientOrderId, //用户自定义订单号
|
||||
}
|
||||
var client *helper.BinanceClient
|
||||
if apiUserInfo.UserPass == "" {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "", apiUserInfo.IpAddress)
|
||||
} else {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "socks5", apiUserInfo.UserPass+"@"+apiUserInfo.IpAddress)
|
||||
}
|
||||
client := GetClient(&apiUserInfo)
|
||||
_, _, err := client.SendFuturesRequestAuth(endpoint, "DELETE", params)
|
||||
if err != nil {
|
||||
var dataMap map[string]interface{}
|
||||
@ -815,12 +792,7 @@ func (e FutRestApi) CancelAllFutOrder(apiUserInfo DbModels.LineApiUser, symbol s
|
||||
"symbol": symbol, //交易对
|
||||
"recvWindow": "5000",
|
||||
}
|
||||
var client *helper.BinanceClient
|
||||
if apiUserInfo.UserPass == "" {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "", apiUserInfo.IpAddress)
|
||||
} else {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "socks5", apiUserInfo.UserPass+"@"+apiUserInfo.IpAddress)
|
||||
}
|
||||
client := GetClient(&apiUserInfo)
|
||||
_, _, err := client.SendFuturesRequestAuth(endpoint, "DELETE", params)
|
||||
if err != nil {
|
||||
var dataMap map[string]interface{}
|
||||
@ -854,12 +826,7 @@ func (e FutRestApi) CancelBatchFutOrder(apiUserInfo DbModels.LineApiUser, symbol
|
||||
"symbol": symbol, //交易对
|
||||
"origClientOrderIdList": string(marshal),
|
||||
}
|
||||
var client *helper.BinanceClient
|
||||
if apiUserInfo.UserPass == "" {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "", apiUserInfo.IpAddress)
|
||||
} else {
|
||||
client, _ = helper.NewBinanceClient(apiUserInfo.ApiKey, apiUserInfo.ApiSecret, "socks5", apiUserInfo.UserPass+"@"+apiUserInfo.IpAddress)
|
||||
}
|
||||
client := GetClient(&apiUserInfo)
|
||||
_, code, err := client.SendFuturesRequestAuth(endpoint, "DELETE", params)
|
||||
if err != nil {
|
||||
log.Error("取消合约委托失败 参数:", params)
|
||||
@ -893,8 +860,8 @@ func (e FutRestApi) CalcSymbolExchangeAmt(symbol string, quoteSymbol string, tot
|
||||
tickerSymbol := helper.DefaultRedis.Get(rediskey.FutSymbolTicker).Val()
|
||||
tickerSymbolMaps := make([]dto.Ticker, 0)
|
||||
sonic.Unmarshal([]byte(tickerSymbol), &tickerSymbolMaps)
|
||||
var targetSymbol string
|
||||
targetSymbol = strings.Replace(symbol, quoteSymbol, "USDT", 1) //ETHBTC -》 ETHUSDT
|
||||
|
||||
targetSymbol := strings.Replace(symbol, quoteSymbol, "USDT", 1) //ETHBTC -》 ETHUSDT
|
||||
key := fmt.Sprintf("%s:%s", global.TICKER_FUTURES, targetSymbol)
|
||||
tradeSet, _ := helper.GetObjString[models.TradeSet](helper.DefaultRedis, key)
|
||||
var targetPrice decimal.Decimal
|
||||
@ -908,11 +875,6 @@ func (e FutRestApi) CalcSymbolExchangeAmt(symbol string, quoteSymbol string, tot
|
||||
return quantity
|
||||
}
|
||||
|
||||
// 加仓主账号
|
||||
func (e FutRestApi) CoverAccountA(apiUserInfo DbModels.LineApiUser, symbol string) {
|
||||
|
||||
}
|
||||
|
||||
// GetFutSymbolLastPrice 获取现货交易对最新价格
|
||||
func (e FutRestApi) GetFutSymbolLastPrice(targetSymbol string) (lastPrice decimal.Decimal) {
|
||||
key := fmt.Sprintf(global.TICKER_FUTURES, global.EXCHANGE_BINANCE, targetSymbol)
|
||||
@ -979,7 +941,7 @@ func (e FutRestApi) GetOrderByOrderSn(symbol, orderSn string, apiUserInfo DbMode
|
||||
}
|
||||
|
||||
/*
|
||||
查询现货委托
|
||||
查询合约委托
|
||||
*/
|
||||
// 根据订单号获取订单信息,如果获取失败,则进行重试
|
||||
func (e FutRestApi) GetOrderByOrderSnLoop(symbol, ordersn string, apiUserInfo DbModels.LineApiUser, retryCount int) (order binancedto.BinanceFutureOrder, err error) {
|
||||
|
||||
Reference in New Issue
Block a user