This commit is contained in:
苏尹岚
2020-12-02 08:56:12 +08:00
parent 53f7119f71
commit 845068b29a

View File

@@ -259,15 +259,11 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
}
} else {
order.BusinessType = model.BusinessTypeImmediate
if msg.OrderExt != nil && msg.OrderExt.O2ODeliveryTime != "" {
order.ExpectedDeliveredTime = utils.Str2Time(msg.OrderExt.O2ODeliveryTime)
} else {
if time2, err := getAPI(msg.VendorOrgCode).GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
if time2 == "" {
order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour)
} else {
order.ExpectedDeliveredTime = utils.Str2Time(time2)
}
if time2, err := getAPI(msg.VendorOrgCode).GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
if time2 == "" {
order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour)
} else {
order.ExpectedDeliveredTime = utils.Str2Time(time2)
}
}
}