From df70e159c1eecec3d5549e0916808b647a1f0a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 13 Aug 2020 09:12:48 +0800
Subject: [PATCH] =?UTF-8?q?jdwl=20nil=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index f968a207f..41e665df1 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1446,8 +1446,9 @@ func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err erro
 				waybill = v
 			}
 		}
-		handler := partner.DeliveryPlatformHandlers[waybill.WaybillVendorID]
-		err = handler.Handler.CancelWaybill(waybill, 0, "订单已发送其他物流")
+		if handler := partner.GetDeliveryPlatformFromVendorID(model.VendorIDJDWL); handler != nil {
+			err = handler.Handler.CancelWaybill(waybill, 0, "订单已发送其他物流")
+		}
 		if err != nil {
 			return err
 		}
@@ -1503,12 +1504,13 @@ func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err erro
 		dao.UpdateEntity(db, order, "EclpOutID")
 		vendorWaybillID = eclpSoNo
 	} else {
-		handler := partner.DeliveryPlatformHandlers[model.VendorIDJDWL]
-		waybill2, err := handler.Handler.CreateWaybill(order, 0)
-		if err != nil {
-			return err
+		if handler := partner.GetDeliveryPlatformFromVendorID(model.VendorIDJDWL); handler != nil {
+			waybill2, err := handler.Handler.CreateWaybill(order, 0)
+			if err != nil {
+				return err
+			}
+			vendorWaybillID = waybill2.VendorWaybillID
 		}
-		vendorWaybillID = waybill2.VendorWaybillID
 	}
 	jdshop.CurPurchaseHandler.OrderExport(ctx, vendorOrderID, vendorWaybillID, false)
 	return err