From 63cecd7c4c959329d9b3eae35d9e56813230db76 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 20 Jan 2020 14:16:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A5=BF=E7=99=BE=E6=9C=80=E5=90=8E=E6=9C=9F?= =?UTF-8?q?=E6=9C=9B=E9=80=81=E8=BE=BE=E7=94=A8=E6=9C=80=E5=90=8E=E9=80=81?= =?UTF-8?q?=E8=BE=BE=EF=BC=88latest=5Fsend=5Ftime)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/order.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 046c9627f..3c955958d 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -187,6 +187,14 @@ func (p *PurchaseHandler) partRefund2OrderDetailSkuList(orderID string, orderDet return skuList } +func getExpectedDeliveredTime(orderMap map[string]interface{}) (expectedTime time.Time) { + expectedTime = getTimeFromInterface(orderMap["latest_send_time"]) + if utils.IsTimeZero(expectedTime) { + expectedTime = getTimeFromInterface(orderMap["send_time"]) + } + return expectedTime +} + func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) { result := orderData shopMap := result["shop"].(map[string]interface{}) @@ -206,7 +214,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo ConsigneeAddress: utils.Interface2String(userMap["address"]), CoordinateType: model.CoordinateTypeBaiDu, BuyerComment: utils.TrimBlankChar(utils.Interface2String(orderMap["remark"])), - ExpectedDeliveredTime: getTimeFromInterface(orderMap["send_time"]), + ExpectedDeliveredTime: getExpectedDeliveredTime(orderMap), PickDeadline: utils.DefaultTimeValue, VendorStatus: utils.Int64ToStr(utils.MustInterface2Int64(orderMap["status"])), OrderSeq: int(utils.ForceInterface2Int64(orderMap["order_index"])),