types: add MarshalJSON method on strint64

This commit is contained in:
c9s 2023-05-18 18:08:40 +08:00
parent d7183cb38f
commit fd6a9d50a4
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54
4 changed files with 21 additions and 12 deletions

View File

@ -3,15 +3,19 @@ package bitgetapi
//go:generate -command GetRequest requestgen -method GET -responseType .APIResponse -responseDataField Data //go:generate -command GetRequest requestgen -method GET -responseType .APIResponse -responseDataField Data
//go:generate -command PostRequest requestgen -method POST -responseType .APIResponse -responseDataField Data //go:generate -command PostRequest requestgen -method POST -responseType .APIResponse -responseDataField Data
import "github.com/c9s/requestgen" import (
"github.com/c9s/requestgen"
"github.com/c9s/bbgo/pkg/types"
)
type Account struct { type Account struct {
UserId string `json:"user_id"` UserId types.StrInt64 `json:"user_id"`
InviterId string `json:"inviter_id"` InviterId types.StrInt64 `json:"inviter_id"`
Ips string `json:"ips"` Ips string `json:"ips"`
Authorities []string `json:"authorities"` Authorities []string `json:"authorities"`
ParentId string `json:"parentId"` ParentId types.StrInt64 `json:"parentId"`
Trader bool `json:"trader"` Trader bool `json:"trader"`
} }
//go:generate GetRequest -url "/api/spot/v1/account/getInfo" -type GetAccountRequest -responseDataType .Account //go:generate GetRequest -url "/api/spot/v1/account/getInfo" -type GetAccountRequest -responseDataType .Account

View File

@ -11,10 +11,10 @@ import (
) )
type Fill struct { type Fill struct {
AccountId string `json:"accountId"` AccountId types.StrInt64 `json:"accountId"`
Symbol string `json:"symbol"` Symbol string `json:"symbol"`
OrderId string `json:"orderId"` OrderId types.StrInt64 `json:"orderId"`
FillId string `json:"fillId"` FillId types.StrInt64 `json:"fillId"`
OrderType OrderType `json:"orderType"` OrderType OrderType `json:"orderType"`
Side OrderSide `json:"side"` Side OrderSide `json:"side"`
FillPrice fixedpoint.Value `json:"fillPrice"` FillPrice fixedpoint.Value `json:"fillPrice"`

View File

@ -11,9 +11,9 @@ import (
) )
type OrderDetail struct { type OrderDetail struct {
AccountId string `json:"accountId"` AccountId types.StrInt64 `json:"accountId"`
Symbol string `json:"symbol"` Symbol string `json:"symbol"`
OrderId string `json:"orderId"` OrderId types.StrInt64 `json:"orderId"`
ClientOrderId string `json:"clientOrderId"` ClientOrderId string `json:"clientOrderId"`
Price fixedpoint.Value `json:"price"` Price fixedpoint.Value `json:"price"`
Quantity fixedpoint.Value `json:"quantity"` Quantity fixedpoint.Value `json:"quantity"`

View File

@ -8,6 +8,11 @@ import (
type StrInt64 int64 type StrInt64 int64
func (s *StrInt64) MarshalJSON() ([]byte, error) {
ss := strconv.FormatInt(int64(*s), 10)
return json.Marshal(ss)
}
func (s *StrInt64) UnmarshalJSON(body []byte) error { func (s *StrInt64) UnmarshalJSON(body []byte) error {
var arg interface{} var arg interface{}
if err := json.Unmarshal(body, &arg); err != nil { if err := json.Unmarshal(body, &arg); err != nil {