diff --git a/protocol/model_stock_minute_trade.go b/protocol/model_stock_minute_trade.go index 4d40c88..af0f903 100644 --- a/protocol/model_stock_minute_trade.go +++ b/protocol/model_stock_minute_trade.go @@ -10,7 +10,7 @@ type StockMinuteTradeResp struct { List []*StockMinuteTrade } -// StockMinuteTrade 分时成交,todo 时间没有到秒,客户端上也没有 +// StockMinuteTrade 分时成交,todo 时间没有到秒,客户端上也没有,东方客户端能显示秒 type StockMinuteTrade struct { Time string //时间 Price Price //价格 @@ -20,7 +20,7 @@ type StockMinuteTrade struct { } func (this *StockMinuteTrade) String() string { - return fmt.Sprintf("%s \t%s \t%-6s \t%-6d(手) \t%-4d(单) \t%-4s", this.Time, this.Price, FloatUnitString(float64(this.Amount2())/100), this.Volume, this.Number, this.StatusString()) + return fmt.Sprintf("%s \t%s \t%-6s \t%-6d(手) \t%-4d(单) \t%-4s", this.Time, this.Price, this.Amount(), this.Volume, this.Number, this.StatusString()) } // Amount 成交额 @@ -28,10 +28,6 @@ func (this *StockMinuteTrade) Amount() Price { return this.Price * Price(this.Volume) * 100 } -func (this *StockMinuteTrade) Amount2() int64 { - return this.Price.Int64() * int64(this.Volume) * 100 -} - func (this *StockMinuteTrade) StatusString() string { switch this.Status { case 0: diff --git a/protocol/types_price.go b/protocol/types_price.go index 41196b8..3c8e784 100644 --- a/protocol/types_price.go +++ b/protocol/types_price.go @@ -5,7 +5,7 @@ import ( ) // Price 价格,单位分,分时成交的总金额可能会超出范围,后续改成int64 -type Price int32 +type Price int64 func (this Price) Float64() float64 { return float64(this) / 100 @@ -16,6 +16,7 @@ func (this Price) Int64() int64 { } func (this Price) String() string { + return fmt.Sprintf("%s元", FloatUnitString(this.Float64())) return fmt.Sprintf("%0.2f元", this.Float64()) }