From e0d0a45d564b49d39fc606d41610c193af19a740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 21 Sep 2020 10:32:57 +0800
Subject: [PATCH] =?UTF-8?q?-30=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/callback.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
index afeb8e7f5..2cbb92430 100644
--- a/business/partner/purchase/jdshop/callback.go
+++ b/business/partner/purchase/jdshop/callback.go
@@ -213,8 +213,8 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 	// 如果是暂停，表示是预订单g
 	if msg.OrderState == jdshopapi.OrderStatusPause || msg.OrderState == jdshopapi.OrderStatusPopPause {
 		order.BusinessType = model.BusinessTypeDingshida
-		if time, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
-			order.ExpectedDeliveredTime = utils.Str2Time(time)
+		if time2, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
+			order.ExpectedDeliveredTime = utils.Str2Time(time2).Add(-time.Minute * 30)
 		}
 		order.PickDeadline = order.ExpectedDeliveredTime.Add(-time.Hour)
 	} else if msg.OrderState == jdshopapi.OrderStatusWait {
@@ -225,9 +225,9 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 		return nil, err
 	}
 	if msg.IDSopShipmenttype == jdshopapi.IdSopShipmenttypeTC {
-		if time, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
+		if time2, err := api.JdShopAPI.GetOrderExtInfoByOrderId(order.VendorOrderID2); err == nil {
 			order.BusinessType = model.BusinessTypeDingshida
-			order.ExpectedDeliveredTime = utils.Str2Time(time)
+			order.ExpectedDeliveredTime = utils.Str2Time(time2).Add(-time.Minute * 30)
 		}
 	}
 	setJdsOrderSeq(order)