From 57e96e0da5280c60f886a57922adf4ec5a95c848 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, 17 Mar 2020 09:15:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 34e81703d..83245975d 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -903,7 +903,7 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
 						}
 					}
 					MarkArrears(db, order, orderPay)
-					CancelMatterOrder(db, order, reason)
+					err = CancelMatterOrder(db, order, reason)
 				} else {
 					orderPay.Status = model.PayStatusCanceled
 					_, err2 := dao.UpdateEntity(db, orderPay)
@@ -920,7 +920,7 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
 		}
 		err = errList.GetErrListAsOne()
 		if len(payList) == 0 {
-			CancelMatterOrder(db, order, "")
+			err = CancelMatterOrder(db, order, "")
 		}
 	} else {
 		err = fmt.Errorf("当前订单状态:%s不允许取消", model.OrderStatusName[order.Status])
@@ -1278,7 +1278,7 @@ func tryToSplitMatterOrder(jxOrder *JxOrderInfo) (outOrders []*JxOrderInfo, frei
 	)
 	//我的思路为把所有商品依次按重量销量从大到小排列，然后第一个包尽量分出5kg，后面分出3kg
 	//但是我把JxSkuInfo放进list的时候，想根据一个参数GroupSign判断是否这个商品已经分出去了
-	//但是在list中同一个商品似乎放进去的地址是一样的，我改了一个商品的GroupSign，所有的都变了，所以只有分出一个JxSkuInfo2去弄。。
+	//但是在list中同一个商品通过以下方式放进去的地址是一样的，我改了一个商品的GroupSign，所有的都变了，所以只有分出一个JxSkuInfo2去弄。。
 	//要做优化的话更好
 	for _, v := range skus {
 		for i := 0; i < v.Count; i++ {
@@ -1302,6 +1302,7 @@ func tryToSplitMatterOrder(jxOrder *JxOrderInfo) (outOrders []*JxOrderInfo, frei
 		}
 	}
 	for {
+		//每拿出一组就删掉list里的值
 		outOrders = append(outOrders, loop(weightList, jxOrder, flag))
 		for i := 0; i < len(weightList); {
 			if weightList[i].GroupSign {