From 845068b29a6b6a625b8749cb0a5865ca5e988a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 2 Dec 2020 08:56:12 +0800
Subject: [PATCH] a

---
 business/partner/purchase/jdshop/callback.go | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
index cd11138a5..db74bb749 100644
--- a/business/partner/purchase/jdshop/callback.go
+++ b/business/partner/purchase/jdshop/callback.go
@@ -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)
 				}
 			}
 		}