From c20c7b2489919f82e5b7e7f60f836c4eda2be9af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 9 Mar 2020 15:05:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=88=9B=E5=BB=BA=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 3c5d7d284..8bfbbeea0 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -389,15 +389,6 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 	if distance := jxutils.Point2StoreDistance(deliveryAddress.Lng, deliveryAddress.Lat, storeDetail.Lng, storeDetail.Lat, storeDetail.DeliveryRangeType, storeDetail.DeliveryRange); distance == 0 {
 		return nil, nil, fmt.Errorf("当前送货地址不在门店%s的配送范围", storeDetail.Name)
 	}
-	//表示此订单为物料配送订单
-	if fromStoreID != 0 {
-		storeDetail2, err2 := dao.GetStoreDetail(db, fromStoreID, model.VendorIDJX)
-		if err = err2; err != nil {
-			return nil, nil, fmt.Errorf("fromStoreID有误,[%v]", fromStoreID)
-		}
-		deliveryAddress.ConsigneeName = storeDetail2.Name
-		outJxOrder.FromStoreID = fromStoreID
-	}
 
 	// 营业状态及时间检查
 	if storeDetail.Status != model.StoreStatusOpened { // model.StoreStatusDisabled {
@@ -428,6 +419,16 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 	outJxOrder = &outJxOrder2
 	outJxOrder.StoreName = storeDetail.Name
 
+	//表示此订单为物料配送订单
+	if fromStoreID != 0 {
+		storeDetail2, err2 := dao.GetStoreDetail(db, fromStoreID, model.VendorIDJX)
+		if err = err2; err != nil {
+			return nil, nil, fmt.Errorf("fromStoreID有误,[%v]", fromStoreID)
+		}
+		deliveryAddress.ConsigneeName = storeDetail2.Name
+		outJxOrder.FromStoreID = fromStoreID
+	}
+
 	skus := formalizeSkus(jxOrder.Skus)
 	// 允许空商品列表（一般用于测试配送地址，门店信息是否合适）
 	if len(skus) > 0 {