mirror of
https://github.com/retailcrm/api-client-go.git
synced 2025-04-03 13:13:37 +03:00
fixes for error handling & data types
This commit is contained in:
parent
ae5f5ad677
commit
0762aa771a
3 changed files with 666 additions and 228 deletions
|
|
@ -12,19 +12,19 @@ func (t Tag) MarshalJSON() ([]byte, error) {
|
|||
|
||||
func (a *APIErrorsList) UnmarshalJSON(data []byte) error {
|
||||
var i interface{}
|
||||
var m map[string]string
|
||||
var m APIErrorsList
|
||||
if err := json.Unmarshal(data, &i); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
switch e := i.(type) {
|
||||
case map[string]interface{}:
|
||||
m = make(map[string]string, len(e))
|
||||
m = make(APIErrorsList, len(e))
|
||||
for idx, val := range e {
|
||||
m[idx] = fmt.Sprint(val)
|
||||
}
|
||||
case []interface{}:
|
||||
m = make(map[string]string, len(e))
|
||||
m = make(APIErrorsList, len(e))
|
||||
for idx, val := range e {
|
||||
m[strconv.Itoa(idx)] = fmt.Sprint(val)
|
||||
}
|
||||
|
|
@ -33,3 +33,51 @@ func (a *APIErrorsList) UnmarshalJSON(data []byte) error {
|
|||
*a = m
|
||||
return nil
|
||||
}
|
||||
|
||||
func (l *CustomFieldsList) UnmarshalJSON(data []byte) error {
|
||||
var i interface{}
|
||||
var m CustomFieldsList
|
||||
if err := json.Unmarshal(data, &i); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
switch e := i.(type) {
|
||||
case map[string]interface{}:
|
||||
m = make(CustomFieldsList, len(e))
|
||||
for idx, val := range e {
|
||||
m[idx] = fmt.Sprint(val)
|
||||
}
|
||||
case []interface{}:
|
||||
m = make(CustomFieldsList, len(e))
|
||||
for idx, val := range e {
|
||||
m[strconv.Itoa(idx)] = fmt.Sprint(val)
|
||||
}
|
||||
}
|
||||
|
||||
*l = m
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *OrderPayments) UnmarshalJSON(data []byte) error {
|
||||
var i interface{}
|
||||
var m OrderPayments
|
||||
if err := json.Unmarshal(data, &i); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
switch e := i.(type) {
|
||||
case map[string]interface{}:
|
||||
m = make(OrderPayments, len(e))
|
||||
for idx, val := range e {
|
||||
m[idx] = val.(OrderPayment)
|
||||
}
|
||||
case []interface{}:
|
||||
m = make(OrderPayments, len(e))
|
||||
for idx, val := range e {
|
||||
m[strconv.Itoa(idx)] = val.(OrderPayment)
|
||||
}
|
||||
}
|
||||
|
||||
*p = m
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
195
types.go
195
types.go
|
|
@ -122,41 +122,41 @@ Customer related types
|
|||
|
||||
// Customer type.
|
||||
type Customer struct {
|
||||
ID int `json:"id,omitempty"`
|
||||
ExternalID string `json:"externalId,omitempty"`
|
||||
FirstName string `json:"firstName,omitempty"`
|
||||
LastName string `json:"lastName,omitempty"`
|
||||
Patronymic string `json:"patronymic,omitempty"`
|
||||
Sex string `json:"sex,omitempty"`
|
||||
Email string `json:"email,omitempty"`
|
||||
Phones []Phone `json:"phones,omitempty"`
|
||||
Address *Address `json:"address,omitempty"`
|
||||
CreatedAt string `json:"createdAt,omitempty"`
|
||||
Birthday string `json:"birthday,omitempty"`
|
||||
ManagerID int `json:"managerId,omitempty"`
|
||||
Vip bool `json:"vip,omitempty"`
|
||||
Bad bool `json:"bad,omitempty"`
|
||||
Site string `json:"site,omitempty"`
|
||||
Source *Source `json:"source,omitempty"`
|
||||
Contragent *Contragent `json:"contragent,omitempty"`
|
||||
PersonalDiscount float32 `json:"personalDiscount,omitempty"`
|
||||
CumulativeDiscount float32 `json:"cumulativeDiscount,omitempty"`
|
||||
DiscountCardNumber string `json:"discountCardNumber,omitempty"`
|
||||
EmailMarketingUnsubscribedAt string `json:"emailMarketingUnsubscribedAt,omitempty"`
|
||||
AvgMarginSumm float32 `json:"avgMarginSumm,omitempty"`
|
||||
MarginSumm float32 `json:"marginSumm,omitempty"`
|
||||
TotalSumm float32 `json:"totalSumm,omitempty"`
|
||||
AverageSumm float32 `json:"averageSumm,omitempty"`
|
||||
OrdersCount int `json:"ordersCount,omitempty"`
|
||||
CostSumm float32 `json:"costSumm,omitempty"`
|
||||
MaturationTime int `json:"maturationTime,omitempty"`
|
||||
FirstClientID string `json:"firstClientId,omitempty"`
|
||||
LastClientID string `json:"lastClientId,omitempty"`
|
||||
BrowserID string `json:"browserId,omitempty"`
|
||||
MgCustomerID string `json:"mgCustomerId,omitempty"`
|
||||
PhotoURL string `json:"photoUrl,omitempty"`
|
||||
CustomFields map[string]string `json:"customFields,omitempty"`
|
||||
Tags []Tag `json:"tags,omitempty"`
|
||||
ID int `json:"id,omitempty"`
|
||||
ExternalID string `json:"externalId,omitempty"`
|
||||
FirstName string `json:"firstName,omitempty"`
|
||||
LastName string `json:"lastName,omitempty"`
|
||||
Patronymic string `json:"patronymic,omitempty"`
|
||||
Sex string `json:"sex,omitempty"`
|
||||
Email string `json:"email,omitempty"`
|
||||
Phones []Phone `json:"phones,omitempty"`
|
||||
Address *Address `json:"address,omitempty"`
|
||||
CreatedAt string `json:"createdAt,omitempty"`
|
||||
Birthday string `json:"birthday,omitempty"`
|
||||
ManagerID int `json:"managerId,omitempty"`
|
||||
Vip bool `json:"vip,omitempty"`
|
||||
Bad bool `json:"bad,omitempty"`
|
||||
Site string `json:"site,omitempty"`
|
||||
Source *Source `json:"source,omitempty"`
|
||||
Contragent *Contragent `json:"contragent,omitempty"`
|
||||
PersonalDiscount float32 `json:"personalDiscount,omitempty"`
|
||||
CumulativeDiscount float32 `json:"cumulativeDiscount,omitempty"`
|
||||
DiscountCardNumber string `json:"discountCardNumber,omitempty"`
|
||||
EmailMarketingUnsubscribedAt string `json:"emailMarketingUnsubscribedAt,omitempty"`
|
||||
AvgMarginSumm float32 `json:"avgMarginSumm,omitempty"`
|
||||
MarginSumm float32 `json:"marginSumm,omitempty"`
|
||||
TotalSumm float32 `json:"totalSumm,omitempty"`
|
||||
AverageSumm float32 `json:"averageSumm,omitempty"`
|
||||
OrdersCount int `json:"ordersCount,omitempty"`
|
||||
CostSumm float32 `json:"costSumm,omitempty"`
|
||||
MaturationTime int `json:"maturationTime,omitempty"`
|
||||
FirstClientID string `json:"firstClientId,omitempty"`
|
||||
LastClientID string `json:"lastClientId,omitempty"`
|
||||
BrowserID string `json:"browserId,omitempty"`
|
||||
MgCustomerID string `json:"mgCustomerId,omitempty"`
|
||||
PhotoURL string `json:"photoUrl,omitempty"`
|
||||
CustomFields CustomFieldsList `json:"customFields,omitempty"`
|
||||
Tags []Tag `json:"tags,omitempty"`
|
||||
}
|
||||
|
||||
// CorporateCustomer type.
|
||||
|
|
@ -167,7 +167,7 @@ type CorporateCustomer struct {
|
|||
CreatedAt string `json:"createdAt,omitempty"`
|
||||
Vip bool `json:"vip,omitempty"`
|
||||
Bad bool `json:"bad,omitempty"`
|
||||
CustomFields map[string]string `json:"customFields,omitempty"`
|
||||
CustomFields CustomFieldsList `json:"customFields,omitempty"`
|
||||
PersonalDiscount float32 `json:"personalDiscount,omitempty"`
|
||||
DiscountCardNumber string `json:"discountCardNumber,omitempty"`
|
||||
ManagerID int `json:"managerId,omitempty"`
|
||||
|
|
@ -218,17 +218,17 @@ type CorporateCustomerContactCustomer struct {
|
|||
}
|
||||
|
||||
type Company struct {
|
||||
ID int `json:"id,omitempty"`
|
||||
IsMain bool `json:"isMain,omitempty"`
|
||||
ExternalID string `json:"externalId,omitempty"`
|
||||
Active bool `json:"active,omitempty"`
|
||||
Name string `json:"name,omitempty"`
|
||||
Brand string `json:"brand,omitempty"`
|
||||
Site string `json:"site,omitempty"`
|
||||
CreatedAt string `json:"createdAt,omitempty"`
|
||||
Contragent *Contragent `json:"contragent,omitempty"`
|
||||
Address *IdentifiersPair `json:"address,omitempty"`
|
||||
CustomFields map[string]string `json:"customFields,omitempty"`
|
||||
ID int `json:"id,omitempty"`
|
||||
IsMain bool `json:"isMain,omitempty"`
|
||||
ExternalID string `json:"externalId,omitempty"`
|
||||
Active bool `json:"active,omitempty"`
|
||||
Name string `json:"name,omitempty"`
|
||||
Brand string `json:"brand,omitempty"`
|
||||
Site string `json:"site,omitempty"`
|
||||
CreatedAt string `json:"createdAt,omitempty"`
|
||||
Contragent *Contragent `json:"contragent,omitempty"`
|
||||
Address *IdentifiersPair `json:"address,omitempty"`
|
||||
CustomFields CustomFieldsList `json:"customFields,omitempty"`
|
||||
}
|
||||
|
||||
// CorporateCustomerNote type.
|
||||
|
|
@ -273,57 +273,60 @@ type CorporateCustomerHistoryRecord struct {
|
|||
Order related types
|
||||
*/
|
||||
|
||||
type OrderPayments map[string]OrderPayment
|
||||
type CustomFieldsList map[string]string
|
||||
|
||||
// Order type.
|
||||
type Order struct {
|
||||
ID int `json:"id,omitempty"`
|
||||
ExternalID string `json:"externalId,omitempty"`
|
||||
Number string `json:"number,omitempty"`
|
||||
FirstName string `json:"firstName,omitempty"`
|
||||
LastName string `json:"lastName,omitempty"`
|
||||
Patronymic string `json:"patronymic,omitempty"`
|
||||
Email string `json:"email,omitempty"`
|
||||
Phone string `json:"phone,omitempty"`
|
||||
AdditionalPhone string `json:"additionalPhone,omitempty"`
|
||||
CreatedAt string `json:"createdAt,omitempty"`
|
||||
StatusUpdatedAt string `json:"statusUpdatedAt,omitempty"`
|
||||
ManagerID int `json:"managerId,omitempty"`
|
||||
Mark int `json:"mark,omitempty"`
|
||||
Call bool `json:"call,omitempty"`
|
||||
Expired bool `json:"expired,omitempty"`
|
||||
FromAPI bool `json:"fromApi,omitempty"`
|
||||
MarkDatetime string `json:"markDatetime,omitempty"`
|
||||
CustomerComment string `json:"customerComment,omitempty"`
|
||||
ManagerComment string `json:"managerComment,omitempty"`
|
||||
Status string `json:"status,omitempty"`
|
||||
StatusComment string `json:"statusComment,omitempty"`
|
||||
FullPaidAt string `json:"fullPaidAt,omitempty"`
|
||||
Site string `json:"site,omitempty"`
|
||||
OrderType string `json:"orderType,omitempty"`
|
||||
OrderMethod string `json:"orderMethod,omitempty"`
|
||||
CountryIso string `json:"countryIso,omitempty"`
|
||||
Summ float32 `json:"summ,omitempty"`
|
||||
TotalSumm float32 `json:"totalSumm,omitempty"`
|
||||
PrepaySum float32 `json:"prepaySum,omitempty"`
|
||||
PurchaseSumm float32 `json:"purchaseSumm,omitempty"`
|
||||
DiscountManualAmount float32 `json:"discountManualAmount,omitempty"`
|
||||
DiscountManualPercent float32 `json:"discountManualPercent,omitempty"`
|
||||
Weight float32 `json:"weight,omitempty"`
|
||||
Length int `json:"length,omitempty"`
|
||||
Width int `json:"width,omitempty"`
|
||||
Height int `json:"height,omitempty"`
|
||||
ShipmentStore string `json:"shipmentStore,omitempty"`
|
||||
ShipmentDate string `json:"shipmentDate,omitempty"`
|
||||
ClientID string `json:"clientId,omitempty"`
|
||||
Shipped bool `json:"shipped,omitempty"`
|
||||
UploadedToExternalStoreSystem bool `json:"uploadedToExternalStoreSystem,omitempty"`
|
||||
Source *Source `json:"source,omitempty"`
|
||||
Contragent *Contragent `json:"contragent,omitempty"`
|
||||
Customer *Customer `json:"customer,omitempty"`
|
||||
Delivery *OrderDelivery `json:"delivery,omitempty"`
|
||||
Marketplace *OrderMarketplace `json:"marketplace,omitempty"`
|
||||
Items []OrderItem `json:"items,omitempty"`
|
||||
CustomFields map[string]string `json:"customFields,omitempty"`
|
||||
Payments map[string]OrderPayment `json:"payments,omitempty"`
|
||||
ID int `json:"id,omitempty"`
|
||||
ExternalID string `json:"externalId,omitempty"`
|
||||
Number string `json:"number,omitempty"`
|
||||
FirstName string `json:"firstName,omitempty"`
|
||||
LastName string `json:"lastName,omitempty"`
|
||||
Patronymic string `json:"patronymic,omitempty"`
|
||||
Email string `json:"email,omitempty"`
|
||||
Phone string `json:"phone,omitempty"`
|
||||
AdditionalPhone string `json:"additionalPhone,omitempty"`
|
||||
CreatedAt string `json:"createdAt,omitempty"`
|
||||
StatusUpdatedAt string `json:"statusUpdatedAt,omitempty"`
|
||||
ManagerID int `json:"managerId,omitempty"`
|
||||
Mark int `json:"mark,omitempty"`
|
||||
Call bool `json:"call,omitempty"`
|
||||
Expired bool `json:"expired,omitempty"`
|
||||
FromAPI bool `json:"fromApi,omitempty"`
|
||||
MarkDatetime string `json:"markDatetime,omitempty"`
|
||||
CustomerComment string `json:"customerComment,omitempty"`
|
||||
ManagerComment string `json:"managerComment,omitempty"`
|
||||
Status string `json:"status,omitempty"`
|
||||
StatusComment string `json:"statusComment,omitempty"`
|
||||
FullPaidAt string `json:"fullPaidAt,omitempty"`
|
||||
Site string `json:"site,omitempty"`
|
||||
OrderType string `json:"orderType,omitempty"`
|
||||
OrderMethod string `json:"orderMethod,omitempty"`
|
||||
CountryIso string `json:"countryIso,omitempty"`
|
||||
Summ float32 `json:"summ,omitempty"`
|
||||
TotalSumm float32 `json:"totalSumm,omitempty"`
|
||||
PrepaySum float32 `json:"prepaySum,omitempty"`
|
||||
PurchaseSumm float32 `json:"purchaseSumm,omitempty"`
|
||||
DiscountManualAmount float32 `json:"discountManualAmount,omitempty"`
|
||||
DiscountManualPercent float32 `json:"discountManualPercent,omitempty"`
|
||||
Weight float32 `json:"weight,omitempty"`
|
||||
Length int `json:"length,omitempty"`
|
||||
Width int `json:"width,omitempty"`
|
||||
Height int `json:"height,omitempty"`
|
||||
ShipmentStore string `json:"shipmentStore,omitempty"`
|
||||
ShipmentDate string `json:"shipmentDate,omitempty"`
|
||||
ClientID string `json:"clientId,omitempty"`
|
||||
Shipped bool `json:"shipped,omitempty"`
|
||||
UploadedToExternalStoreSystem bool `json:"uploadedToExternalStoreSystem,omitempty"`
|
||||
Source *Source `json:"source,omitempty"`
|
||||
Contragent *Contragent `json:"contragent,omitempty"`
|
||||
Customer *Customer `json:"customer,omitempty"`
|
||||
Delivery *OrderDelivery `json:"delivery,omitempty"`
|
||||
Marketplace *OrderMarketplace `json:"marketplace,omitempty"`
|
||||
Items []OrderItem `json:"items,omitempty"`
|
||||
CustomFields CustomFieldsList `json:"customFields,omitempty"`
|
||||
Payments OrderPayments `json:"payments,omitempty"`
|
||||
}
|
||||
|
||||
// OrdersStatus type.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue