lychiyu/qbtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: lychiyu:9e3ee03976d2daef17d6de9f9cbd55ea456a081c
Branches Tags
lychiyu:main
...
compare: lychiyu:79ae41c0ccd9aca4f2e0d7af0f7e121beea65474
Branches Tags
lychiyu:main

2 Commits
9e3ee03976 ... 79ae41c0cc

Author SHA1 Message Date
lychiyu
79ae41c0cc not pause notify 2024-08-05 06:33:04 +08:00
lychiyu
0b23e9f2f0 pause trade 2024-08-05 00:08:03 +08:00
2 changed files with 8 additions and 8 deletions
Show Stats Expand all files Collapse all files

6
config/ccinr.yaml
View File

@ -36,9 +36,9 @@ exchangeStrategies:
# - ETHUSDT # - ETHUSDT
# - SOLUSDT # - SOLUSDT
interval: 1m interval: 15m
nrInterval: 1m nrInterval: 15m
cciInterval: 5m cciInterval: 15m
atrInterval: 2h atrInterval: 2h
nrCount: 4 nrCount: 4
cciWindow: 20 cciWindow: 20

10
pkg/strategy/ccinr/strategy.go
View File

@ -426,7 +426,7 @@ func (s *Strategy) isTradeTime(ctx context.Context) bool {
now := time.Now().In(location) now := time.Now().In(location)
hour := now.Hour() hour := now.Hour()
return hour >= s.TradeStartHour && hour < s.TradeEndHour return !(hour >= s.TradeStartHour && hour < s.TradeEndHour)
} }
func (s *Strategy) isPauseTrade(ctx context.Context) bool { func (s *Strategy) isPauseTrade(ctx context.Context) bool {
@ -535,10 +535,10 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor qbtrade.OrderExecutor,
} }
if !s.isTradeTime(ctx) || s.isPauseTrade(ctx) { if !s.isTradeTime(ctx) || s.isPauseTrade(ctx) {
pauseMsg := fmt.Sprintf("暂停交易：总收益：%v, 暂停次数：%v, 暂停时间：%v; 暂停时间段：[%v, %v)", //pauseMsg := fmt.Sprintf("暂停交易：总收益：%v, 暂停次数：%v, 暂停时间：%v; 暂停时间段：[%v, %v)",
s.TotalProfit.Float64(), s.PauseTradeCount.Float64(), s.PauseTradeTime, s.TradeStartHour, // s.TotalProfit.Float64(), s.PauseTradeCount.Float64(), s.PauseTradeTime, s.TradeStartHour,
s.TradeEndHour) // s.TradeEndHour)
qbtrade.Notify(pauseMsg) //qbtrade.Notify(pauseMsg)
return return
} }