From a576358b43abe6319bc501ea32246d6612506b0a 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 12:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AE=A2=E5=8D=95=E5=88=86?=
 =?UTF-8?q?=E5=8C=85=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 350deab37..1cba1e673 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -631,11 +631,11 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 		// 	}
 		// 	outJxOrder.FreightPrice = int64(freightPrice)
 		// } else {
-			if outJxOrder.Weight <= 2000 {
-				outJxOrder.FreightPrice = 500
-			} else {
-				outJxOrder.FreightPrice = utils.Float64TwoInt64(500 + math.Ceil((utils.Int2Float64(outJxOrder.Weight)-2000)/1000)*200)
-			}
+		if outJxOrder.Weight <= 2000 {
+			outJxOrder.FreightPrice = 500
+		} else {
+			outJxOrder.FreightPrice = utils.Float64TwoInt64(500 + math.Ceil((utils.Int2Float64(outJxOrder.Weight)-2000)/1000)*200)
+		}
 		// }
 	} else {
 		if outJxOrder.FreightPrice > specialFreightPrice {
@@ -836,9 +836,11 @@ func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
 				skus = append(skus, sku)
 			}
 			jxOrder.Skus = skus
+			globals.SugarLogger.Debugf("tryToSplitMatterOrder3,[%v]", utils.Format4Output(jxOrder, false))
 			outOrders, _, _ := tryToSplitMatterOrder(jxOrder)
-			globals.SugarLogger.Debugf("tryToSplitMatterOrder,[%v]", utils.Format4Output(outOrders, false))
+			globals.SugarLogger.Debugf("tryToSplitMatterOrder2,[%v]", utils.Format4Output(outOrders, false))
 			for _, v := range outOrders {
+				globals.SugarLogger.Debugf("tryToSplitMatterOrder4,[%v]", *v)
 				outJxOrder, deliveryAddress, err := generateOrder(jxcontext.AdminCtx, v, order.AddressID, order.FromStoreID)
 				if err != nil {
 					return err