lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-22 23:05:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

bbgo: fix profit field check condition

Browse Source
This commit is contained in:
c9s 2021-10-14 07:33:15 +08:00
parent 5c3f305060
commit 7e8897f1d0
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/bbgo/profitstats.go
View File

@ -40,7 +40,7 @@ type Profit struct {
StrategyInstanceID string `json:"strategyInstanceID" db:"strategy_instance_id"` StrategyInstanceID string `json:"strategyInstanceID" db:"strategy_instance_id"`
} }
func (p Profit) SlackAttachment() slack.Attachment { func (p *Profit) SlackAttachment() slack.Attachment {
var title string = fmt.Sprintf("%s PnL ", p.Symbol) var title string = fmt.Sprintf("%s PnL ", p.Symbol)
var color string var color string
if p.Profit > 0 { if p.Profit > 0 {
@ -48,12 +48,12 @@ func (p Profit) SlackAttachment() slack.Attachment {
title = "+" + p.Profit.String() + " " + p.QuoteCurrency title = "+" + p.Profit.String() + " " + p.QuoteCurrency
} else { } else {
color = types.RedColor color = types.RedColor
title = "-" + p.Profit.String() + " " + p.QuoteCurrency title = p.Profit.String() + " " + p.QuoteCurrency
} }
var fields []slack.AttachmentField var fields []slack.AttachmentField
if p.NetProfit > 0 { if p.NetProfit != 0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Net Profit", Title: "Net Profit",
Value: p.NetProfit.String() + " " + p.QuoteCurrency, Value: p.NetProfit.String() + " " + p.QuoteCurrency,
@ -61,7 +61,7 @@ func (p Profit) SlackAttachment() slack.Attachment {
}) })
} }
if p.ProfitMargin > 0 { if p.ProfitMargin != 0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Profit Margin", Title: "Profit Margin",
Value: p.ProfitMargin.Percentage(), Value: p.ProfitMargin.Percentage(),
@ -69,7 +69,7 @@ func (p Profit) SlackAttachment() slack.Attachment {
}) })
} }
if p.NetProfitMargin > 0 { if p.NetProfitMargin != 0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Net Profit Margin", Title: "Net Profit Margin",
Value: p.NetProfitMargin.Percentage(), Value: p.NetProfitMargin.Percentage(),
@ -77,7 +77,7 @@ func (p Profit) SlackAttachment() slack.Attachment {
}) })
} }
if p.TradeAmount > 0.0 { if p.TradeAmount != 0.0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Trade Amount", Title: "Trade Amount",
Value: p.TradeAmount.String() + " " + p.QuoteCurrency, Value: p.TradeAmount.String() + " " + p.QuoteCurrency,
@ -85,7 +85,7 @@ func (p Profit) SlackAttachment() slack.Attachment {
}) })
} }
if p.FeeInUSD > 0 { if p.FeeInUSD != 0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Fee In USD", Title: "Fee In USD",
Value: p.FeeInUSD.String() + " USD", Value: p.FeeInUSD.String() + " USD",
@ -93,7 +93,7 @@ func (p Profit) SlackAttachment() slack.Attachment {
}) })
} }
if len(p.Strategy) > 0 { if len(p.Strategy) != 0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Strategy", Title: "Strategy",
Value: p.Strategy, Value: p.Strategy,
@ -109,7 +109,7 @@ func (p Profit) SlackAttachment() slack.Attachment {
} }
} }
func (p Profit) PlainText() string { func (p *Profit) PlainText() string {
return fmt.Sprintf("%s trade profit %s %f %s (%.2f%%), net profit =~ %f %s (%.2f%%)", return fmt.Sprintf("%s trade profit %s %f %s (%.2f%%), net profit =~ %f %s (%.2f%%)",
p.Symbol, p.Symbol,
pnlEmoji(p.Profit), pnlEmoji(p.Profit),
@ -210,7 +210,7 @@ func (s *ProfitStats) PlainText() string {
) )
} }
func (s ProfitStats) SlackAttachment() slack.Attachment { func (s *ProfitStats) SlackAttachment() slack.Attachment {
var title string = fmt.Sprintf("%s Accumulated PnL ", s.Symbol) var title string = fmt.Sprintf("%s Accumulated PnL ", s.Symbol)
var color string var color string
if s.AccumulatedPnL > 0 { if s.AccumulatedPnL > 0 {
@ -218,7 +218,7 @@ func (s ProfitStats) SlackAttachment() slack.Attachment {
title = "+" + s.AccumulatedPnL.String() + " " + s.QuoteCurrency title = "+" + s.AccumulatedPnL.String() + " " + s.QuoteCurrency
} else { } else {
color = types.RedColor color = types.RedColor
title = "-" + s.AccumulatedPnL.String() + " " + s.QuoteCurrency title = s.AccumulatedPnL.String() + " " + s.QuoteCurrency
} }
since := time.Unix(s.AccumulatedSince, 0).Local() since := time.Unix(s.AccumulatedSince, 0).Local()
@ -226,7 +226,7 @@ func (s ProfitStats) SlackAttachment() slack.Attachment {
var fields []slack.AttachmentField var fields []slack.AttachmentField
if s.TodayProfit > 0 { if s.TodayProfit != 0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Profit Today", Title: "Profit Today",
Value: s.TodayProfit.String() + " " + s.QuoteCurrency, Value: s.TodayProfit.String() + " " + s.QuoteCurrency,
@ -234,7 +234,7 @@ func (s ProfitStats) SlackAttachment() slack.Attachment {
}) })
} }
if s.TodayNetProfit > 0 { if s.TodayNetProfit != 0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Net Profit Today", Title: "Net Profit Today",
Value: s.TodayNetProfit.String() + " " + s.QuoteCurrency, Value: s.TodayNetProfit.String() + " " + s.QuoteCurrency,
@ -242,7 +242,7 @@ func (s ProfitStats) SlackAttachment() slack.Attachment {
}) })
} }
if s.TodayLoss > 0 { if s.TodayLoss != 0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Loss Today", Title: "Loss Today",
Value: s.TodayLoss.String() + " " + s.QuoteCurrency, Value: s.TodayLoss.String() + " " + s.QuoteCurrency,
@ -251,21 +251,21 @@ func (s ProfitStats) SlackAttachment() slack.Attachment {
} }
if s.AccumulatedProfit > 0 { if s.AccumulatedProfit != 0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Accumulated Profit", Title: "Accumulated Profit",
Value: s.AccumulatedProfit.String() + " " + s.QuoteCurrency, Value: s.AccumulatedProfit.String() + " " + s.QuoteCurrency,
}) })
} }
if s.AccumulatedNetProfit > 0 { if s.AccumulatedNetProfit != 0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Accumulated Net Profit", Title: "Accumulated Net Profit",
Value: s.AccumulatedNetProfit.String() + " " + s.QuoteCurrency, Value: s.AccumulatedNetProfit.String() + " " + s.QuoteCurrency,
}) })
} }
if s.AccumulatedLoss > 0 { if s.AccumulatedLoss != 0 {
fields = append(fields, slack.AttachmentField{ fields = append(fields, slack.AttachmentField{
Title: "Accumulated Loss", Title: "Accumulated Loss",
Value: s.AccumulatedLoss.String() + " " + s.QuoteCurrency, Value: s.AccumulatedLoss.String() + " " + s.QuoteCurrency,