diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index d9149d38a..5d47cc607 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -642,11 +642,12 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod if globals.EnableEbaiStoreWrite { if isAgree { //售后同意多次取消 - if order.Status > model.OrderStatusEndBegin { - err = api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID) - } else { - err = api.EbaiAPI.OrderAgreeRefund(order.VendorOrderID) - } + err = api.EbaiAPI.OrderAgreeRefund(order.VendorOrderID) + //if order.Status > model.OrderStatusEndBegin { + // err = api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID) + //} else { + // + //} } else { err = api.EbaiAPI.OrderDisagreeRefund(order.VendorOrderID, reason) } diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go index 860ccb875..055ce7031 100644 --- a/business/partner/purchase/ebai/order_afs.go +++ b/business/partner/purchase/ebai/order_afs.go @@ -240,21 +240,34 @@ func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, ord } // 发起全款退款 -func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, afsOrder *model.AfsOrder, reason string) (err error) { +func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) { //售后退单 部分/全部 - if order.Status > model.OrderStatusEndBegin { - return c.PartRefundOrder(ctx, order, order.Skus, afsOrder, afsOrder.Skus, reason) - } else { - return c.PartRefundOrder(ctx, order, order.Skus, afsOrder, afsOrder.Skus, reason) - } + return c.PartRefundOrder(ctx, order, order.Skus, reason) } // 发起部分退款 售后/售中 -func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, afsOrder *model.AfsOrder, refundSkuList2 []*model.OrderSkuFinancial, reason string) (err error) { +func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, reason string) (err error) { if globals.EnableEbaiStoreWrite { //售后部分多次退款 if order.Status > model.OrderStatusEndBegin { - if err := api.EbaiAPI.OrderAgreePartRefund(afsOrder.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrder.AfsOrderID); err != nil { + //获取afsOrder + var afsOrderInfo *model.AfsOrder + result, err := api.EbaiAPI.OrderPartRefundGet(order.VendorOrderID) + if err != nil { + return err + } + afsOrderInfo = CurPurchaseHandler.AfsOrderDetail2Financial(result) + //var param1 []*ebaiapi.RefundSku + //for _, v := range afsOrderInfo.Skus { + // param1 = append(param1, &ebaiapi.RefundSku{ + // SkuID: v.SkuID, + // Upc: v, + // CustomeSkuID: "", + // Number: "", + // }) + //} + + if err := api.EbaiAPI.OrderAgreePartRefund(afsOrderInfo.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrderInfo.AfsOrderID); err != nil { return err } } else {