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"])),