From e32429ac985ac16a5559ac81813d1039f42fbec1 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, 18 Jun 2020 15:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E8=A5=BF=E5=95=86=E5=9F=8E=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 200056427..772fcc015 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1160,7 +1160,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 	if err != nil || order == nil {
 		return "", fmt.Errorf("未查询到该订单！订单号：[%v]", vendorOrderID)
 	}
-	if order.Status >= model.OrderStatusDelivering {
+	if order.Status >= model.OrderStatusDelivering && order.Status != model.OrderStatusCanceled {
 		return "", fmt.Errorf("暂不支持此状态的订单进行转移！")
 	}
 	if order.VendorID != model.VendorIDJDShop {
@@ -1290,6 +1290,8 @@ func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err erro
 		if err != nil {
 			return err
 		}
+		order.EclpOutID = eclpSoNo
+		dao.UpdateEntity(db, order, "EclpOutID")
 		vendorWaybillID = eclpSoNo
 	} else {
 		handler := partner.DeliveryPlatformHandlers[model.VendorIDJDWL]