From 82ea38d86b02f463968f6b25a8ad3b6f9c8bb0cb 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, 28 Apr 2020 10:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AE=A2=E5=8D=95=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E8=B4=B9=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 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 5a6655bf9..484faa8e1 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -204,6 +204,10 @@ func GetMyOrderCountInfo(ctx *jxcontext.Context, fromDate, toDate time.Time, sta
 	return countInfo, err
 }
 
+//fromStoreID 为0 表示非物料订单（京西商城订单等）
+//fromStoreID 为 门店ID ，表示是物料订单，fromStoreID表示是哪个门店申请的物料
+//fromStoreID 为-1 表示也是物料订单，但是不是门店申请，是个人申请的
+//fromStoreID 在后面 generateOrder中有用
 func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf bool) (outJxOrder *JxOrderInfo, err error) {
 	outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID, "", IsDeliverySelf)
 	if err != nil {
@@ -1530,6 +1534,8 @@ func tryToSplitMatterOrder(jxOrder *JxOrderInfo) (outOrders []*JxOrderInfo, frei
 		}
 	}
 	for _, v := range outOrders {
+		fmt.Println("v", utils.Format4Output(v, false))
+		fmt.Println("freightPrice", freightPrice)
 		if v.Weight <= 3000 {
 			freightPrice += 500
 		} else if v.Weight > 3000 && v.Weight <= splitMatterOrderMinWeight {