From 7404bdf0dcc56f6b8be94f5fb526bb8b621daead Mon Sep 17 00:00:00 2001 From: ying liu Date: Mon, 29 Jul 2024 12:42:15 +0800 Subject: [PATCH] mid price --- .gitignore | 4 +++- otp.png | Bin 2967 -> 3113 bytes pkg/strategy/ccinr/strategy.go | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0ca7bbe..12e7f95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .idea .vscode *.log -*.exe \ No newline at end of file +*.exe +qbtrade.yaml +*.png \ No newline at end of file diff --git a/otp.png b/otp.png index 171f58358f8cb56613df114b604c1f1e5c7065ed..54c6e89e3eda6830fb7e7b9ccc2779fc8745bc99 100644 GIT binary patch literal 3113 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 1 { qbtrade.Notify(fmt.Sprintf("交易信号未成交，取消订单: %s", symbol)) s.cancelOrders(ctx, symbol) } + + if s.TradeType[symbol] != "" && s.TradeRetry[symbol] <= 1 { + s.TradeRetry[symbol] = s.TradeRetry[symbol] + 1 + } } s.TradeKLine[symbol] = k } @@ -402,6 +411,7 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor qbtrade.OrderExecutor, log.Infof("the long order is filled: %+v,id is %d, symbol is %s, type is %s, status is %s", order, order.OrderID, orderSymbol, order.Type, order.Status) s.Traded[orderSymbol] = true + s.TradeRetry[orderSymbol] = 0 qbtrade.Notify("订单成交通知：\n 币种：%s, 方向：%s, 价格：%s, 数量：%s", order.Symbol, s.TradeType, order.Price, order.Quantity) } @@ -409,6 +419,7 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor qbtrade.OrderExecutor, log.Infof("the short order is filled: %+v,id is %d, symbol is %s, type is %s, status is %s", order, order.OrderID, orderSymbol, order.Type, order.Status) s.Traded[orderSymbol] = true + s.TradeRetry[orderSymbol] = 0 qbtrade.Notify("订单成交通知：\n 币种：%s, 方向：%s, 价格：%s, 数量：%s", order.Symbol, s.TradeType, order.Price, order.Quantity) } @@ -418,6 +429,7 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor qbtrade.OrderExecutor, "status is %s", order, order.OrderID, orderSymbol, order.Type, order.Status) qbtrade.Notify("订单止盈或止损通知：\n %s", order.Symbol) s.Traded[orderSymbol] = false + s.TradeRetry[orderSymbol] = 0 s.TradeType[orderSymbol] = "" } else { log.Infof("the order is: %+v,id is %d, symbol is %s, type is %s, status is %s",