diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 04c178664..57cf3c359 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -184,6 +184,18 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo return order } +func getRefundSkuDetailList(msg *mtwmapi.CallbackMsg) (skuList []*mtwmapi.RefundSkuDetail, err error) { + if false { + skuList = api.MtwmAPI.GetRefundSkuDetailFromMsg(msg) + } else { + refundOrderDetail, err2 := api.MtwmAPI.GetOrderRefundDetail(utils.Str2Int64(GetOrderIDFromMsg(msg)), mtwmapi.RefundTypePart) + if err = err2; err == nil { + skuList = refundOrderDetail.WmAppRetailForOrderPartRefundList + } + } + return skuList, err +} + func getSkuWeight(product map[string]interface{}) (weight int) { searchResult := specPat.FindStringSubmatch(product["spec"].(string)) if len(searchResult) == 3 { @@ -224,16 +236,18 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap if status.Status == model.OrderStatusAdjust { var order *model.GoodsOrder if order, err = c.GetOrder(GetOrderIDFromMsg(msg)); err == nil { - skuList := api.MtwmAPI.GetRefundSkuDetailFromMsg(msg) - var removedSkuList []*model.OrderSku - for _, mtwmSku := range skuList { - removedSkuList = append(removedSkuList, &model.OrderSku{ - SkuID: int(utils.Str2Int64WithDefault(mtwmSku.SkuID, 0)), - Count: mtwmSku.Count, - }) + skuList, err2 := getRefundSkuDetailList(msg) + if err = err2; err == nil { + var removedSkuList []*model.OrderSku + for _, mtwmSku := range skuList { + removedSkuList = append(removedSkuList, &model.OrderSku{ + SkuID: int(utils.Str2Int64WithDefault(mtwmSku.SkuID, 0)), + Count: mtwmSku.Count, + }) + } + order = jxutils.RemoveSkuFromOrder(order, removedSkuList) + err = partner.CurOrderManager.OnOrderAdjust(order, status) } - order = jxutils.RemoveSkuFromOrder(order, removedSkuList) - err = partner.CurOrderManager.OnOrderAdjust(order, status) } } else { err = partner.CurOrderManager.OnOrderStatusChanged(status)