From 187a0df82f9b6e5f44c0e0306a19de59e79fd50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 7 May 2020 16:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=88=86=E5=8C=85bug?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/storeman.go              | 12 ++++++------
 business/partner/purchase/jx/localjx/order.go |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go
index d77e02159..4330ead2b 100644
--- a/business/jxstore/cms/storeman.go
+++ b/business/jxstore/cms/storeman.go
@@ -107,13 +107,13 @@ func (s *StoreManager) OnCourierStoreStatusChanged(ctx *jxcontext.Context, vendo
 		db := dao.GetDB()
 		_, err2 := dao.GetStoreDetail2(db, 0, vendorStoreID, vendorID)
 		if err = err2; err == nil {
-			status := model.StoreStatusOpened
-			if auditStatus != model.StoreAuditStatusOnline {
-				status = model.StoreStatusDisabled
-			}
+			// status := model.StoreStatusOpened
+			// if auditStatus != model.StoreAuditStatusOnline {
+			// 	status = model.StoreStatusDisabled
+			// }
 			_, err = dao.UpdateEntityLogically(db, &model.StoreCourierMap{}, map[string]interface{}{
-				model.FieldStatus: status,
-				"AuditStatus":     auditStatus,
+				// model.FieldStatus: status,
+				"AuditStatus": auditStatus,
 			}, ctx.GetUserName(), map[string]interface{}{
 				model.FieldVendorStoreID: vendorStoreID,
 				model.FieldVendorID:      vendorID,
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 2e81b01fa..027077161 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -1498,7 +1498,7 @@ func tryToSplitMatterOrder(jxOrder *JxOrderInfo) (outOrders []*JxOrderInfo, frei
 		skus       = jxOrder.Skus
 		weightList []*JxSkuInfo2
 	)
-	//我的思路为把所有商品依次按重量销量从大到小排列，然后第一个包尽量分出3kg，后面分出5kg
+	//我的思路为把所有商品依次按重量销量从大到小排列，然后第一个包尽量分出3kg，后面分出4.5kg
 	//但是我把JxSkuInfo放进list的时候，想根据一个参数GroupSign判断是否这个商品已经分出去了
 	//但是在list中同一个商品通过以下方式放进去的地址是一样的，我改了一个商品的GroupSign，所有的都变了，所以只有分出一个JxSkuInfo2去弄。。
 	//要做优化的话更好
@@ -1524,6 +1524,8 @@ func tryToSplitMatterOrder(jxOrder *JxOrderInfo) (outOrders []*JxOrderInfo, frei
 		}
 	}
 	weight := jxOrder.Weight
+	globals.SugarLogger.Debugf("Testweight", weight)
+	globals.SugarLogger.Debugf("Testweight", utils.Format4Output(weightList, false))
 	for {
 		//每拿出一组就删掉list里的值
 		outOrders = append(outOrders, loop2(weightList, jxOrder.StoreID, &weight))
@@ -1547,7 +1549,6 @@ func tryToSplitMatterOrder(jxOrder *JxOrderInfo) (outOrders []*JxOrderInfo, frei
 			freightPrice += utils.Float64TwoInt64(500 + math.Ceil((utils.Int2Float64(v.Weight)-3000)/1000)*200)
 		}
 	}
-	globals.SugarLogger.Debugf("outOrders", utils.Format4Output(outOrders, false))
 	return outOrders, freightPrice, err
 }