From 18e72079c538ecdf237bee73fac7d4360d8561f2 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, 10 Mar 2020 09:53:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E6=96=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E7=89=A9=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/api_config.go                  | 3 +++
 business/partner/purchase/jx/localjx/order.go | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/business/model/api_config.go b/business/model/api_config.go
index 1eb9f795c..585369c0f 100644
--- a/business/model/api_config.go
+++ b/business/model/api_config.go
@@ -45,6 +45,8 @@ const (
 	VendorIDAutonavi   = 321 // 高德导航
 	VendorIDQiNiuCloud = 323 // 七牛云
 	VendorIDShowAPI    = 325 // 万维易源
+
+	VendorIDJDWL = 401 //京东物流
 )
 
 type VendorInfo struct {
@@ -95,6 +97,7 @@ var (
 
 		VendorIDDada: "达达众包",
 		VendorIDMTPS: "美团配送",
+		VendorIDJDWL: "京东物流",
 
 		VendorIDFeiE:      "飞鹅",
 		VendorIDXiaoWM:    "外卖管家",
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index de411194d..c39c2f141 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -572,7 +572,10 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
 	}
 	order.TotalShopMoney += jxOrder.FreightPrice
 	order.ActualPayPrice = order.TotalShopMoney
-	order.FromStoreID = jxOrder.FromStoreID
+	if jxOrder.FromStoreID != 0 {
+		order.FromStoreID = jxOrder.FromStoreID
+		order.WaybillVendorID = model.VendorIDJDWL
+	}
 	return order, err
 }