From 376aaedde784014a49c4beb422736df85e0b1953 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 15:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=BE=85=E6=8B=A3=E8=B4=A7?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=B0=9D=E8=AF=95=E6=8B=A3=E8=B4=A7=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jd/order.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index fbc1aacf2..fcb958031 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -114,7 +114,10 @@ func (c *PurchaseHandler) onOrderMsg(vendorOrgCode string, msg *jdapi.CallbackOr
 						VendorOrgCode: vendorOrgCode,
 						VendorOrderID: msg.BillID,
 					}
-					c.PickupGoods(order, false, jxcontext.AdminCtx.GetUserName())
+					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)