liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fk

Browse Source
This commit is contained in:
gazebo
2019-06-10 16:10:42 +08:00
parent c90c99a5fd
commit 083bc279ec
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
business/jxutils/jxutils.go
View File

@@ -468,10 +468,18 @@ func RemoveSkuFromOrder(order *model.GoodsOrder, removedSkuList []*model.OrderSk
removedSkuMap2 := make(map[string]*model.OrderSku) removedSkuMap2 := make(map[string]*model.OrderSku)
for _, sku := range removedSkuList { for _, sku := range removedSkuList {
if skuID := GetSkuIDFromOrderSku(sku); skuID > 0 { 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 != "" { 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 var skuList []*model.OrderSku
@@ -490,8 +498,10 @@ func RemoveSkuFromOrder(order *model.GoodsOrder, removedSkuList []*model.OrderSk
if removedSku != nil { if removedSku != nil {
if removedSku.Count >= sku.Count { if removedSku.Count >= sku.Count {
tmp = nil tmp = nil
removedSku.Count -= sku.Count
} else { } else {
tmp.Count -= removedSku.Count tmp.Count -= removedSku.Count
removedSku.Count = 0
} }
} }
if tmp != nil { if tmp != nil {

3
business/partner/purchase/mtwm/order.go
View File

@@ -191,10 +191,11 @@ func getRefundSkuDetailList(msg *mtwmapi.CallbackMsg) (skuList []*mtwmapi.Refund
refundOrderDetailList, err2 := api.MtwmAPI.GetOrderRefundDetail(utils.Str2Int64(GetOrderIDFromMsg(msg)), mtwmapi.RefundTypePart) refundOrderDetailList, err2 := api.MtwmAPI.GetOrderRefundDetail(utils.Str2Int64(GetOrderIDFromMsg(msg)), mtwmapi.RefundTypePart)
if err = err2; err == nil { if err = err2; err == nil {
for _, v := range refundOrderDetailList { 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 return skuList, err
} }