From ff1fb5046d6d2568ce21811a313816260d22c442 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, 15 Sep 2020 09:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch.go     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index d03f0a066..c71c94152 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -1,12 +1,13 @@
 package defsch
 
 import (
-	"git.rosy.net.cn/jx-callback/business/jxutils/unipush"
 	"fmt"
 	"math/rand"
 	"sync"
 	"time"
 
+	push "git.rosy.net.cn/jx-callback/business/jxutils/unipush"
+
 	"github.com/astaxie/beego"
 
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
@@ -834,14 +835,14 @@ func (s *DefScheduler) cancelOtherWaybillsCheckOrderDeliveryFlag(savedOrderInfo
 func (s *DefScheduler) solutionJdsOrder(bill *model.Waybill) (err error) {
 	if len(bill.VendorOrderID) > 12 {
 		//表示此订单是京东商城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)
-			}
-		} else {
-			err = jdshop.CurPurchaseHandler.OrderExport(jxcontext.AdminCtx, bill.VendorOrderID, bill.VendorWaybillID, true)
-		}
+		// 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)
+		// 	}
+		// } else {
+		err = jdshop.CurPurchaseHandler.OrderExport(jxcontext.AdminCtx, bill.VendorOrderID, bill.VendorWaybillID, true)
+		// }
 	}
 	return err
 }