From 73220fcf90fa669c9c006226e135188b59a4c391 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, 18 Aug 2020 11:50:31 +0800
Subject: [PATCH] tule

---
 business/partner/purchase/jx/localjx/order.go | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index b95eadcfc..63d5016d3 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -617,7 +617,8 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 						}
 					}
 					if jxSku != nil {
-						if jxOrder.OrderType != model.OrderTypeMatter || (jxOrder.OrderType == model.OrderTypeMatter && fromStoreID == -1) {
+						if fromStoreID == 0 || fromStoreID == -1 {
+							// if jxOrder.OrderType != model.OrderTypeMatter || (jxOrder.OrderType == model.OrderTypeMatter && fromStoreID == -1) {
 							outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
 							outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
 						} else { //以下else为物料订单袋子金额和数量处理
@@ -734,19 +735,19 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 			return nil, nil, fmt.Errorf("fromStoreID有误,[%v]", fromStoreID)
 		}
 		outJxOrder.FromStoreID = fromStoreID
-		if jxOrder.OrderType == model.OrderTypeMatter {
-			//TODO 修改配送费规则，2020-04-28
-			//3kg 5元，每多1kg加2元
-			//配送费要按分包规则计算
-			if outJxOrder.Weight <= 3000 {
-				outJxOrder.FreightPrice = 500
-			} else if outJxOrder.Weight > 3000 && outJxOrder.Weight <= splitMatterOrderMinWeight {
-				outJxOrder.FreightPrice = utils.Float64TwoInt64(500 + math.Ceil((utils.Int2Float64(outJxOrder.Weight)-3000)/1000)*200)
-			} else {
-				_, freightPrice, _ := tryToSplitMatterOrder(jxOrder)
-				outJxOrder.FreightPrice = freightPrice
-			}
+		// if jxOrder.OrderType == model.OrderTypeMatter {
+		//TODO 修改配送费规则，2020-04-28
+		//3kg 5元，每多1kg加2元
+		//配送费要按分包规则计算
+		if outJxOrder.Weight <= 3000 {
+			outJxOrder.FreightPrice = 500
+		} else if outJxOrder.Weight > 3000 && outJxOrder.Weight <= splitMatterOrderMinWeight {
+			outJxOrder.FreightPrice = utils.Float64TwoInt64(500 + math.Ceil((utils.Int2Float64(outJxOrder.Weight)-3000)/1000)*200)
+		} else {
+			_, freightPrice, _ := tryToSplitMatterOrder(jxOrder)
+			outJxOrder.FreightPrice = freightPrice
 		}
+		// }
 		//要求配送人姓名填门店名
 		if fromStoreID != -1 {
 			deliveryAddress.ConsigneeName = storeDetail2.Name
@@ -865,10 +866,10 @@ func jxOrder2GoodsOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, deliveryAd
 		order.FromStoreID = jxOrder.FromStoreID
 		order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
 		order.Flag = 1
-		if jxOrder.OrderType == model.OrderTypeMatter {
-			order.WaybillVendorID = model.VendorIDJDWL
-			order.ConsigneeAddress = deliveryAddress.Address
-		}
+		// if jxOrder.OrderType == model.OrderTypeMatter {
+		order.WaybillVendorID = model.VendorIDJDWL
+		order.ConsigneeAddress = deliveryAddress.Address
+		// }
 	}
 	//如果是自提单就设置
 	if IsDeliverySelf {
@@ -900,8 +901,9 @@ func PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string)
 }
 
 func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
-	err = changeOrderStatus(order.VendorOrderID, model.OrderStatusDelivering, "")
-	if order.OrderType == model.OrderTypeMatter {
+	if order.FromStoreID != 0 {
+		err = changeOrderStatus(order.VendorOrderID, model.OrderStatusDelivering, "")
+		// if order.OrderType == model.OrderTypeMatter {
 		var (
 			db = dao.GetDB()
 		)
@@ -1084,7 +1086,8 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
 }
 
 func CancelMatterOrder(db *dao.DaoDB, order *model.GoodsOrder, reason string) (err error) {
-	if order.OrderType == model.OrderTypeMatter {
+	if order.FromStoreID != 0 {
+		// if order.OrderType == model.OrderTypeMatter {
 		if order.EclpOutID != "" {
 			//表示是京西的物料订单的子订单（拆分后的订单）
 			if len(order.VendorOrderID) == 16 && order.VendorID == model.VendorIDJX {