From 083bc279ecff7cf83375a75cd2a06c216b352b46 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 10 Jun 2019 16:10:42 +0800
Subject: [PATCH] - fk

---
 business/jxutils/jxutils.go             | 14 ++++++++++++--
 business/partner/purchase/mtwm/order.go |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index b641cc11a..7b426c1ae 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -468,10 +468,18 @@ func RemoveSkuFromOrder(order *model.GoodsOrder, removedSkuList []*model.OrderSk
 	removedSkuMap2 := make(map[string]*model.OrderSku)
 	for _, sku := range removedSkuList {
 		if skuID := GetSkuIDFromOrderSku(sku); skuID > 0 {
-			removedSkuMap[skuID] = sku
+			if removedSkuMap[skuID] == nil {
+				removedSkuMap[skuID] = sku
+			} else {
+				removedSkuMap[skuID].Count += sku.Count
+			}
 		}
 		if vendorSkuID := sku.VendorSkuID; vendorSkuID != "" {
-			removedSkuMap2[vendorSkuID] = sku
+			if removedSkuMap2[vendorSkuID] == nil {
+				removedSkuMap2[vendorSkuID] = sku
+			} else {
+				removedSkuMap2[vendorSkuID].Count += sku.Count
+			}
 		}
 	}
 	var skuList []*model.OrderSku
@@ -490,8 +498,10 @@ func RemoveSkuFromOrder(order *model.GoodsOrder, removedSkuList []*model.OrderSk
 		if removedSku != nil {
 			if removedSku.Count >= sku.Count {
 				tmp = nil
+				removedSku.Count -= sku.Count
 			} else {
 				tmp.Count -= removedSku.Count
+				removedSku.Count = 0
 			}
 		}
 		if tmp != nil {
diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index f3219fd12..e81a39b75 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -191,10 +191,11 @@ func getRefundSkuDetailList(msg *mtwmapi.CallbackMsg) (skuList []*mtwmapi.Refund
 		refundOrderDetailList, err2 := api.MtwmAPI.GetOrderRefundDetail(utils.Str2Int64(GetOrderIDFromMsg(msg)), mtwmapi.RefundTypePart)
 		if err = err2; err == nil {
 			for _, v := range refundOrderDetailList {
-				skuList = v.WmAppRetailForOrderPartRefundList
+				skuList = append(skuList, v.WmAppRetailForOrderPartRefundList...)
 			}
 		}
 	}
+	globals.SugarLogger.Debugf("getRefundSkuDetailList orderID:%s skuList:%s", GetOrderIDFromMsg(msg), utils.Format4Output(skuList, true))
 	return skuList, err
 }