From 848ebcc443c467555eff5bad1c3a5fb3adf9f888 Mon Sep 17 00:00:00 2001
From: Rzy <465386466@qq.com>
Date: Mon, 12 Aug 2024 09:18:06 +0800
Subject: [PATCH] =?UTF-8?q?<feat>=E6=8A=A5=E9=94=99=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/http/controllers/front/api.go |  6 +++---
 app/services/thirdpay/pay.go      | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/http/controllers/front/api.go b/app/http/controllers/front/api.go
index ed8db8b..5be2abc 100644
--- a/app/http/controllers/front/api.go
+++ b/app/http/controllers/front/api.go
@@ -44,9 +44,9 @@ func Refund(c *gin.Context) {
 	c.Set("OutTradeNo", req.OutTradeNo)
 
 	appCheckInfo := controllers.GetAppCheckInfo(c).(*services.AppCheck)
-	refund := thirdpay.ThirdPayRefund(c.Request.Context(), req, appCheckInfo, c.ClientIP())
-	if refund.PayCode != errorcode.Success {
-		controllers.ApiRes(c, nil, refund.PayCode)
+	refund, errCode := thirdpay.ThirdPayRefund(c.Request.Context(), req, appCheckInfo, c.ClientIP())
+	if errCode != errorcode.Success {
+		controllers.ApiRes(c, nil, errCode)
 		return
 	}
 	data := thirdpay.NewOrdersResp(refund.Order)
diff --git a/app/services/thirdpay/pay.go b/app/services/thirdpay/pay.go
index 111f67e..01acc83 100644
--- a/app/services/thirdpay/pay.go
+++ b/app/services/thirdpay/pay.go
@@ -46,23 +46,26 @@ func ThirdPayInfoCheck(ctx context.Context, payReq *front.PayReqs, appCheck *ser
 	return
 }
 
-func ThirdPayRefund(ctx context.Context, refundReq *front.RefundReqs, appCheck *services.AppCheck, ip string) (refund *thirdpay.Pay) {
+func ThirdPayRefund(ctx context.Context, refundReq *front.RefundReqs, appCheck *services.AppCheck, ip string) (refund *thirdpay.Pay, errorCode int) {
 	var req types.Reqs
 	copier.Copy(&req, refundReq)
 	check := thirdpay.NewPayCheck(&ctx, &req, appCheck, ip)
 	// 校验表单
 	check.CheckPayInfo()
 	if check.CheckCode != errorcode.Success {
-		return
+		return nil, check.CheckCode
 	}
 	check.CheckOrderRefund()
 	if check.CheckCode != errorcode.Success {
-		return
+		return nil, check.CheckCode
 	}
 	refund = thirdpay.NewPayWithPayCheck(check)
 	refund.CreateOrder(common.ORDER_TYPE_REFUND)
+	if refund.PayCode != errorcode.Success {
+		return refund, refund.PayCode
+	}
 	refund.Refund()
-	return
+	return refund, errorcode.Success
 }
 
 func ThirdPay(check *thirdpay.PayCheck) (pay *thirdpay.Pay) {