From 942fac44e8908652f77b1724e5fa94251f5a31f1 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, 16 Mar 2020 15:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=80=E5=9B=9E=E5=85=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index b01d7cbe8..af9cc49da 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -833,34 +833,34 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
 			}
 			dao.CreateEntity(db, waybill)
 		} else { //如果重量超过5kg则需要进行拆单分包，商品分包规则。最后一个包不超过5kg,其他包不超过3kg
-			jxOrder := &JxOrderInfo{}
-			jxOrder.StoreID = order.StoreID
-			var skus []*JxSkuInfo
-			for _, v := range orderSkus {
-				sku := &JxSkuInfo{}
-				sku.SkuID = v.SkuID
-				sku.SalePrice = v.SalePrice
-				sku.Name = v.SkuName
-				sku.Weight = v.Weight
-				sku.Count = v.Count
-				skus = append(skus, sku)
-			}
-			jxOrder.Skus = skus
-			outOrders, _, _ := tryToSplitMatterOrder(jxOrder)
-			for k, v := range outOrders {
-				outJxOrder, deliveryAddress, err := generateOrder(jxcontext.AdminCtx, v, order.AddressID, order.FromStoreID, order.UserID)
-				if err != nil {
-					return err
-				}
-				outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1)
-				order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress)
-				if err = err2; err == nil {
-					order2.AddressID = order.AddressID
-					order2.Status = model.OrderStatusDelivering
-					err = partner.CurOrderManager.OnOrderNew(order2, model.Order2Status(order2))
-					orderSolutionForWuLiao(order2)
-				}
-			}
+			// jxOrder := &JxOrderInfo{}
+			// jxOrder.StoreID = order.StoreID
+			// var skus []*JxSkuInfo
+			// for _, v := range orderSkus {
+			// 	sku := &JxSkuInfo{}
+			// 	sku.SkuID = v.SkuID
+			// 	sku.SalePrice = v.SalePrice
+			// 	sku.Name = v.SkuName
+			// 	sku.Weight = v.Weight
+			// 	sku.Count = v.Count
+			// 	skus = append(skus, sku)
+			// }
+			// jxOrder.Skus = skus
+			// outOrders, _, _ := tryToSplitMatterOrder(jxOrder)
+			// for k, v := range outOrders {
+			// 	outJxOrder, deliveryAddress, err := generateOrder(jxcontext.AdminCtx, v, order.AddressID, order.FromStoreID, order.UserID)
+			// 	if err != nil {
+			// 		return err
+			// 	}
+			// 	outJxOrder.OrderID = utils.Str2Int64(order.VendorOrderID)*100 + int64(k+1)
+			// 	order2, err2 := jxOrder2GoodsOrder(jxcontext.AdminCtx, outJxOrder, deliveryAddress)
+			// 	if err = err2; err == nil {
+			// 		order2.AddressID = order.AddressID
+			// 		order2.Status = model.OrderStatusDelivering
+			// 		err = partner.CurOrderManager.OnOrderNew(order2, model.Order2Status(order2))
+			// 		orderSolutionForWuLiao(order2)
+			// 	}
+			// }
 			//刷新一下库存
 			for _, v := range goods[0].Skus {
 				cms.RefreshMatterStock(jxcontext.AdminCtx, v.SkuID)