From 7287cf47d187ef431af65235ff4625db38652075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 29 Sep 2020 16:06:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=BE=BE=E8=AE=A2=E5=8D=95ti?=
 =?UTF-8?q?me=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/callback.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
index 8664854eb..9c5fb6146 100644
--- a/business/partner/purchase/jdshop/callback.go
+++ b/business/partner/purchase/jdshop/callback.go
@@ -216,7 +216,11 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 	if msg.OrderState == jdshopapi.OrderStatusPause || msg.OrderState == jdshopapi.OrderStatusPopPause {
 		order.BusinessType = model.BusinessTypeDingshida
 		if time2, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
-			order.ExpectedDeliveredTime = utils.Str2Time(time2).Add(-time.Minute * 30)
+			if time2 == "" {
+				order.ExpectedDeliveredTime = order.OrderCreatedAt.Add(time.Hour)
+			} else {
+				order.ExpectedDeliveredTime = utils.Str2Time(time2).Add(-time.Minute * 30)
+			}
 		}
 		order.PickDeadline = order.ExpectedDeliveredTime.Add(-time.Hour)
 	} else if msg.OrderState == jdshopapi.OrderStatusWait {