From 443505d322602856beabe96b112178852cbf19be Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Tue, 9 Aug 2022 14:27:09 +0800
Subject: [PATCH] refund

---
 business/partner/purchase/ebai/order_afs.go | 16 +++++++++++-----
 controllers/auth2.go                        |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go
index 2d6595b90..860ccb875 100644
--- a/business/partner/purchase/ebai/order_afs.go
+++ b/business/partner/purchase/ebai/order_afs.go
@@ -220,12 +220,13 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(msg *ebaiapi.CallbackMsg) (order
 	return orderStatus
 }
 
-// 审核售后单申请
+// 审核售后单申请 全额退单
 func (c *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) {
 	if globals.EnableEbaiStoreWrite {
 		if approveType == partner.AfsApproveTypeRefused {
 			err = api.EbaiAPI.OrderDisagreeReturnGoods(order.VendorOrderID, order.AfsOrderID, reason)
 		} else {
+
 			err = api.EbaiAPI.OrderAgreeReturnGoods(order.VendorOrderID, order.AfsOrderID)
 		}
 	}
@@ -239,16 +240,21 @@ func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, ord
 }
 
 // 发起全款退款
-func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
-	return c.PartRefundOrder(ctx, order, order.Skus, reason)
+func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, afsOrder *model.AfsOrder, 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)
+	}
 }
 
 // 发起部分退款 售后/售中
-func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, reason string) (err error) {
+func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, afsOrder *model.AfsOrder, refundSkuList2 []*model.OrderSkuFinancial, reason string) (err error) {
 	if globals.EnableEbaiStoreWrite {
 		//售后部分多次退款
 		if order.Status > model.OrderStatusEndBegin {
-			if err := api.EbaiAPI.OrderAgreePartRefund(order.VendorOrderID); err != nil {
+			if err := api.EbaiAPI.OrderAgreePartRefund(afsOrder.VendorOrderID, orderSkus2AfsSkus(refundSkuList), afsOrder.AfsOrderID); err != nil {
 				return err
 			}
 		} else {
diff --git a/controllers/auth2.go b/controllers/auth2.go
index f9c355468..e0593cf24 100644
--- a/controllers/auth2.go
+++ b/controllers/auth2.go
@@ -256,7 +256,7 @@ func (c *Auth2Controller) WeixinMPOAuth2() {
 // @Param	state		query		string		false	"微信回调的登录状态"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
-// @router pay [get]
+// @router /DingDingOAuth2 [get]
 func (c *Auth2Controller) DingDingOAuth2() {
 	var (
 		redirectURL string