From f69afe7c4a2303924b99451f83aacafb43370211 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 25 Dec 2019 21:38:40 +0800 Subject: [PATCH] =?UTF-8?q?AdjustOrder=E4=B8=8EPartRefundOrder=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E4=BA=8E=E5=95=86=E5=93=81=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E7=9A=84=E5=90=88=E5=B9=B6=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/jx_order.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 3e9811381..afb804ea5 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -515,7 +515,7 @@ func (c *OrderController) GetPrinterStatus() { }) } -func skuList2Map(skuList []*model.OrderSku) (skuCount int, skuMap map[int64]*model.OrderSku) { +func skuList2Map(skuList []*model.OrderSku) (skuCount int, skuMap map[int64]*model.OrderSku, outSkuList []*model.OrderSku) { skuMap = make(map[int64]*model.OrderSku) for _, sku := range skuList { skuCount += sku.Count @@ -525,12 +525,13 @@ func skuList2Map(skuList []*model.OrderSku) (skuCount int, skuMap map[int64]*mod if skuMap[index] == nil { tmpSku := *sku skuMap[index] = &tmpSku + outSkuList = append(outSkuList, skuMap[index]) } else { skuMap[index].Count += sku.Count } } } - return skuCount, skuMap + return skuCount, skuMap, outSkuList } func getSkuFromMap(skuMap map[int64]*model.OrderSku, skuID, actID int) (sku *model.OrderSku) { @@ -555,6 +556,7 @@ func (c *OrderController) AdjustOrder() { var skuList []*model.OrderSku err = jxutils.Strings2Objs(params.RemovedSkuInfo, &skuList) if err == nil { + _, _, skuList = skuList2Map(skuList) var order *model.GoodsOrder order, err = partner.CurOrderManager.LoadOrder(params.VendorOrderID, params.VendorID) if err == nil { @@ -781,6 +783,7 @@ func (c *OrderController) PartRefundOrder() { var skuList []*model.OrderSku err = jxutils.Strings2Objs(params.RefundSkuList, &skuList) if err == nil { + _, _, skuList = skuList2Map(skuList) var order *model.GoodsOrder order, err = partner.CurOrderManager.LoadOrder(params.VendorOrderID, params.VendorID) if err == nil { @@ -799,7 +802,7 @@ func (c *OrderController) PartRefundOrder() { } func fillSkuList(skuList, orderSkuList []*model.OrderSku) (isSame bool, err error) { - skuCount, orderSkuMap := skuList2Map(orderSkuList) + skuCount, orderSkuMap, _ := skuList2Map(orderSkuList) skuCount2 := 0 for _, sku := range skuList { skuCount2 += sku.Count