From 37b96b9257a28f0eeee0b8454efe06b288c9f532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 19 Jun 2020 15:58:52 +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=E4=BD=8D=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 4 ++--
 business/jxutils/jxutils.go           | 2 +-
 conf/app.conf                         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index b99e0d1c4..80f06e372 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1075,7 +1075,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o
 		}
 		order := &model.GoodsOrder{
 			VendorOrderID2:   utils.Int64ToStr(jdsOrder.OrderID),
-			VendorOrderID:    utils.Int64ToStr(jdsOrder.OrderID) + "001",
+			VendorOrderID:    utils.Int64ToStr(jdsOrder.OrderID) + "000001",
 			VendorID:         model.VendorIDJDShop,
 			BaseFreightMoney: jxutils.StandardPrice2Int(jdsOrder.Freight),
 			VendorStatus:     utils.Int2Str(jdsOrder.OrderStatus),
@@ -1230,7 +1230,7 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 	if len(order.VendorOrderID) > 12 {
 		suffix := utils.Str2Int(order.VendorOrderID[12:len(order.VendorOrderID)])
 		suffix++
-		order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*100) + utils.Int2Str(suffix)
+		order.VendorOrderID = utils.Int64ToStr(utils.Str2Int64(order.VendorOrderID2)*100000) + utils.Int2Str(suffix)
 	}
 	for _, sku := range skus {
 		sku.VendorOrderID = order.VendorOrderID
diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index 6a878ed2c..442428e55 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -161,7 +161,7 @@ func GetPossibleVendorIDFromVendorOrderID(vendorOrderID string) (vendorID int) {
 			vendorID = model.VendorIDWSC
 		} else if orderIDLen == len("1000004390") {
 			vendorID = model.VendorIDJX
-		} else if orderIDLen == len("124557362562002") {
+		} else if orderIDLen == len("124557362562000001") {
 			vendorID = model.VendorIDJDShop
 		}
 	}
diff --git a/conf/app.conf b/conf/app.conf
index ef6f86ce8..f9ab2bab5 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -395,7 +395,7 @@ enableElmStoreWrite = false
 enableMtwmStoreWrite = false
 enableWscStoreWrite = false
 enableYbStoreWrite = false
-enableJdShopWrite = true
+enableJdShopWrite = false
 
 jdOrgCode = "320406"
 jdLoginName = "jd_jxcs1223"