From 009f75149c78f1815712de97cae4ab928d0a6227 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, 5 Aug 2020 16:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8B=A3=E8=B4=A7=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=BE=80=E5=89=8D=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch.go     |  6 +++---
 business/partner/purchase/jd/order.go         | 20 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index c121ada50..d67ec8997 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -41,9 +41,9 @@ const (
 	minute2Schedule3rdCarrier4Ebai = 30            // 饿百的最少转自配送需要的时间（分钟）
 	minMinute2Schedule3rdCarrier   = 5             // 转三方配送最少等待时间（分钟）
 
-	time2AutoPickupMin   = 14 * time.Minute // 自动拣货等待时间，这个只有在没有PickDeadline信息才有用，否则会根据PickDeadline设置
-	second2AutoPickupGap = 60               //随机60秒
-	time2AutoPickupAhead = 20 * time.Second // 有最后拣货时间的提前值
+	time2AutoPickupMin   = 14 * time.Minute  // 自动拣货等待时间，这个只有在没有PickDeadline信息才有用，否则会根据PickDeadline设置
+	second2AutoPickupGap = 60                //随机60秒
+	time2AutoPickupAhead = 120 * time.Second // 有最后拣货时间的提前值
 
 	switch2SelfDeliverRetryGap   = 3 * time.Second // 转自送失败尝试的时间间隙
 	switch2SelfDeliverRetryCount = 2               // 转自送失败尝试次数
diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index fcb958031..7bcb7d284 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -109,16 +109,16 @@ func (c *PurchaseHandler) onOrderMsg(vendorOrgCode string, msg *jdapi.CallbackOr
 						c.onOrderComment2(a, msg)
 					})
 				}
-				if msg.StatusID == jdapi.OrderStatusVenderAgreeCancel {
-					order := &model.GoodsOrder{
-						VendorOrgCode: vendorOrgCode,
-						VendorOrderID: msg.BillID,
-					}
-					err2 := c.PickupGoods(order, false, jxcontext.AdminCtx.GetUserName())
-					if err2 != nil {
-						globals.SugarLogger.Warnf("京东取消拣货：%v", err2)
-					}
-				}
+				// if msg.StatusID == jdapi.OrderStatusVenderAgreeCancel {
+				// 	order := &model.GoodsOrder{
+				// 		VendorOrgCode: vendorOrgCode,
+				// 		VendorOrderID: msg.BillID,
+				// 	}
+				// 	err2 := c.PickupGoods(order, false, jxcontext.AdminCtx.GetUserName())
+				// 	if err2 != nil {
+				// 		globals.SugarLogger.Warnf("京东取消拣货：%v", err2)
+				// 	}
+				// }
 				err := partner.CurOrderManager.OnOrderStatusChanged(vendorOrgCode, status)
 				retVal = jdapi.Err2CallbackResponse(err, status.VendorStatus)
 			}