From 17d0bbf937844d090da4aab06b91adcdb2b35c04 Mon Sep 17 00:00:00 2001 From: howell <2827207845@qq.com> Date: Fri, 9 Jul 2021 08:33:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/rest/logisitics/logistics.go | 2 +- api/rest/order/Inventory.go | 1 - api/rest/order/Invoice.go | 4 ++-- api/rest/order/order.go | 4 ++-- api/rest/order/pay.go | 4 ++-- api/rest/sku/skuDetail.go | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/api/rest/logisitics/logistics.go b/api/rest/logisitics/logistics.go index c20ae18..1f50897 100644 --- a/api/rest/logisitics/logistics.go +++ b/api/rest/logisitics/logistics.go @@ -41,7 +41,7 @@ type OperatorNode struct { Content string `json:"content"` GroupState string `json:"groupState"` ScanState string `json:"scanState"` - MsgTime string `json:"msgTime"` + MsgTime int64 `json:"msgTime"` SystemOperator string `json:"systemOperator"` OrderID uint `json:"orderId"` } diff --git a/api/rest/order/Inventory.go b/api/rest/order/Inventory.go index 1d438e4..9777156 100644 --- a/api/rest/order/Inventory.go +++ b/api/rest/order/Inventory.go @@ -64,6 +64,5 @@ func (o areaStockState) String() string { type StockState struct { AreaStockState areaStockState `json:"areaStockState"` - LeadTime string `json:"leadTime"` SkuQuantity SkuQuantity `json:"skuQuantity"` } diff --git a/api/rest/order/Invoice.go b/api/rest/order/Invoice.go index a0a61c1..39f4a48 100644 --- a/api/rest/order/Invoice.go +++ b/api/rest/order/Invoice.go @@ -33,7 +33,7 @@ type QueryInvoiceInfoResponse struct { type InvoiceDetail struct { Valid string `json:"valid"` TaxRate float64 `json:"taxRate"` - UpdateTime string `json:"updateTime"` + UpdateTime int64 `json:"updateTime"` Remark string `json:"remark"` IvcCode string `json:"ivcCode"` IvcContentType uint `json:"ivcContentType"` @@ -41,7 +41,7 @@ type InvoiceDetail struct { IvcContentName string `json:"ivcContentName"` FileUrl string `json:"fileUrl"` ExpandColumn string `json:"expandColumn"` - IvcTime string `json:"ivcTime"` + IvcTime int64 `json:"ivcTime"` IvcNo string `json:"ivcNo"` IvcType uint `json:"ivcType"` TotalTaxPrice float64 `json:"totalTaxPrice"` diff --git a/api/rest/order/order.go b/api/rest/order/order.go index ec85380..3d5cd6d 100644 --- a/api/rest/order/order.go +++ b/api/rest/order/order.go @@ -131,9 +131,9 @@ type BaseOrder struct { RootOrderID uint `json:"rootOrderId"` OrderStatus status `json:"orderStatus"` SubmitTime int64 `json:"submitTime"` - CompleteTime string `json:"completeTime"` + CompleteTime int64 `json:"completeTime"` PayTime int64 `json:"payTime"` - OutWarehouseTime string `json:"outWarehouseTime"` + OutWarehouseTime int64 `json:"outWarehouseTime"` PaymentType uint `json:"PaymentType"` Remark string `json:"remark"` OrderType typeState `json:"orderType"` diff --git a/api/rest/order/pay.go b/api/rest/order/pay.go index 878ac51..7f958ef 100644 --- a/api/rest/order/pay.go +++ b/api/rest/order/pay.go @@ -44,11 +44,11 @@ type PayInfoParam struct { type RefundDetail struct { RefundFee float64 `json:"refundFee"` RefundType uint `json:"refundType"` - RefundTime string `json:"refundTime"` + RefundTime int64 `json:"refundTime"` } type PaidDetail struct { PaidInType uint `json:"paidInType"` - PaidInTime string `json:"paidInTime"` + PaidInTime int64 `json:"paidInTime"` PaidInFee float64 `json:"paidInFee"` } diff --git a/api/rest/sku/skuDetail.go b/api/rest/sku/skuDetail.go index 42bca02..d0f898b 100644 --- a/api/rest/sku/skuDetail.go +++ b/api/rest/sku/skuDetail.go @@ -122,7 +122,7 @@ type BookSkuBase struct { Id string `json:"id"` Brand string `json:"brand"` Letters string `json:"letters"` - PublishTime string `json:"publishTime"` + PublishTime int64 `json:"publishTime"` BatchNo string `json:"batchNo"` Author string `json:"author"` ISSN string `json:"ISSN"` @@ -137,6 +137,6 @@ type BookSkuBase struct { PublishNo string `json:"publishNo"` Series string `json:"series"` Editer string `json:"editer"` - PrintTime string `json:"printTime"` + PrintTime int64 `json:"printTime"` Photography string `json:"photography"` }