From 4170b5903fde014372d2e0182a6077cc9a6b2adb Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 27 Aug 2019 16:15:37 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E6=A0=B9=E6=8D=AE=E2=80=9C=E6=82=A8?= =?UTF-8?q?=E5=A5=BD=EF=BC=8C=E8=BF=91=E6=9C=9F=E9=A5=BF=E7=99=BE=E9=9B=B6?= =?UTF-8?q?=E5=94=AE=E5=BC=80=E6=94=BE=E5=B9=B3=E5=8F=B0=E5=AF=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=B8=AD=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E5=B9=B3=E5=8F=B0=E5=B0=86=E4=BB=8E8=E6=9C=8829?= =?UTF-8?q?=E6=97=A5=E8=B5=B7=E6=A0=B9=E6=8D=AE=E9=97=A8=E5=BA=97=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=E9=80=90=E6=AD=A5=E7=81=B0=E5=BA=A6=EF=BC=8C=E9=A2=84?= =?UTF-8?q?=E8=AE=A19=E6=9C=88=E5=BA=95=E5=85=A8=E9=87=8F=E3=80=82?= =?UTF-8?q?=E8=AF=B7=E5=BC=80=E5=8F=91=E8=80=85=E5=85=B3=E6=B3=A8=E2=80=9D?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/ebaiapi/order.go | 61 ++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/platformapi/ebaiapi/order.go b/platformapi/ebaiapi/order.go index bd596118..d39c4a55 100644 --- a/platformapi/ebaiapi/order.go +++ b/platformapi/ebaiapi/order.go @@ -41,6 +41,7 @@ const ( WaybillStatusSelfDelivery = "18" // 自行配送 WaybillStatusDontDeliver = "19" // 不再配送 WaybillStatusDeliveryRejected = "20" // 配送拒单 + WaybillStatusCourierArrived = "21" // 骑士到店 ) const ( @@ -188,31 +189,31 @@ type OrderDetailInfo struct { Ext struct { TaoxiFlag int `json:"taoxi_flag"` } `json:"ext"` - FinishedTime string `json:"finished_time"` - InvoiceTitle string `json:"invoice_title"` - IsColdBoxOrder int `json:"is_cold_box_order"` - IsPrivate int `json:"is_private"` - LatestSendTime int `json:"latest_send_time"` - MealNum string `json:"meal_num"` - NeedInvoice int `json:"need_invoice"` - OrderFlag int `json:"order_flag"` - OrderFrom string `json:"order_from"` - OrderID string `json:"order_id"` - OrderIndex string `json:"order_index"` - PackageFee int `json:"package_fee"` - PayStatus int `json:"pay_status"` - PayType int `json:"pay_type"` - PickupTime int `json:"pickup_time"` - Remark string `json:"remark"` - ResponsibleParty string `json:"responsible_party"` - SendFee int `json:"send_fee"` - SendImmediately int `json:"send_immediately"` - SendTime int `json:"send_time"` - ShopFee int `json:"shop_fee"` - Status int `json:"status"` - TaxerID string `json:"taxer_id"` - TotalFee int `json:"total_fee"` - UserFee int `json:"user_fee"` + FinishedTime string `json:"finished_time"` + InvoiceTitle string `json:"invoice_title"` + IsColdBoxOrder int `json:"is_cold_box_order"` + IsPrivate int `json:"is_private"` + LatestSendTime int `json:"latest_send_time"` + MealNum string `json:"meal_num"` + NeedInvoice int `json:"need_invoice"` + OrderFlag int `json:"order_flag"` + OrderFrom string `json:"order_from"` + OrderID string `json:"order_id"` + OrderIndex string `json:"order_index"` + PackageFee int `json:"package_fee"` + PayStatus int `json:"pay_status"` + PayType int `json:"pay_type"` + PickupTime int `json:"pickup_time"` + Remark string `json:"remark"` + // ResponsibleParty string `json:"responsible_party"` + SendFee int `json:"send_fee"` + SendImmediately int `json:"send_immediately"` + SendTime int `json:"send_time"` + ShopFee int `json:"shop_fee"` + Status int `json:"status"` + TaxerID string `json:"taxer_id"` + TotalFee int `json:"total_fee"` + UserFee int `json:"user_fee"` } `json:"order"` Products [][]*OrderProductInfo `json:"products"` Shop *struct { @@ -223,8 +224,8 @@ type OrderDetailInfo struct { Source string `json:"source"` User *struct { Address string `json:"address"` - City string `json:"city"` - Coord *struct { + // City string `json:"city"` + Coord *struct { Latitude string `json:"latitude"` Longitude string `json:"longitude"` } `json:"coord"` @@ -232,13 +233,13 @@ type OrderDetailInfo struct { Latitude string `json:"latitude"` Longitude string `json:"longitude"` } `json:"coord_amap"` - District string `json:"district"` + // District string `json:"district"` Gender string `json:"gender"` Name string `json:"name"` Phone string `json:"phone"` PrivacyPhone string `json:"privacy_phone"` - Province string `json:"province"` - UserID string `json:"user_id"` + // Province string `json:"province"` + UserID string `json:"user_id"` } `json:"user"` }