From 790e5c33bbe491e5a0fca34a170b78aebc9d5809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 23 Jun 2020 13:54:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go |  4 ++--
 business/partner/delivery/jdeclp/waybill.go    | 11 +++++++----
 business/partner/purchase/jdshop/order.go      |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 643de03df..9ad119341 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -763,9 +763,9 @@ func (s *DefScheduler) cancelOtherWaybillsCheckOrderDeliveryFlag(savedOrderInfo
 }
 
 func (s *DefScheduler) solutionJdsOrder(bill *model.Waybill) (err error) {
-	//表示此订单是京东商城转移的订单，不用出库，但要去修改运单号
 	if len(bill.VendorOrderID) > 12 {
-		if utils.Str2Int(bill.VendorOrderID[12:len(bill.VendorOrderID)]) > 1 {
+		//表示此订单是京东商城2次转移的订单，不用出库，但要去修改运单号
+		if utils.Str2Int(bill.VendorOrderID[12:len(bill.VendorOrderID)]) > 2 {
 			err = jdshop.CurPurchaseHandler.OrderTransfer(jxcontext.AdminCtx, bill.VendorOrderID, bill.VendorWaybillID, true)
 			if err != nil {
 				globals.SugarLogger.Errorf("京东商城订单自动转移失败！", err)
diff --git a/business/partner/delivery/jdeclp/waybill.go b/business/partner/delivery/jdeclp/waybill.go
index c781d6104..7015c38b6 100644
--- a/business/partner/delivery/jdeclp/waybill.go
+++ b/business/partner/delivery/jdeclp/waybill.go
@@ -30,6 +30,13 @@ func (c *DeliveryHandler) GetVendorID() int {
 	return model.VendorIDJDWL
 }
 
+func OnWaybillMsg() {
+}
+
+func (c *DeliveryHandler) OnWaybillMsg() {
+
+}
+
 func (c *DeliveryHandler) CreateStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) (vendorStoreID string, status int, err error) {
 	return vendorStoreID, status, err
 }
@@ -94,7 +101,3 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf
 func (c *DeliveryHandler) ComplaintRider(bill *model.Waybill, resonID int, resonContent string) (err error) {
 	return err
 }
-
-func (c *DeliveryHandler) OnWaybillMsg() {
-
-}
diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
index dea5ba173..ef14062a4 100644
--- a/business/partner/purchase/jdshop/order.go
+++ b/business/partner/purchase/jdshop/order.go
@@ -167,7 +167,7 @@ func (p *PurchaseHandler) OrderTransfer(ctx *jxcontext.Context, vendorOrderID, v
 	if !isAuto {
 		companyID = jdshopapi.JdsDeliveryCompanyJD
 	}
-	err = api.JdShopAPI.UpdateWaybill(vendorOrderID[:12], companyID, vendorWaybillID)
+	err = api.JdShopAPI.UpdateWaybill(vendorOrderID[:12], companyID, vendorOrderID)
 	return err
 }