temp

app/main/api/internal/queue/paySuccessNotify.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"strings"
+	"tyc-server/app/main/api/internal/service"
 	"tyc-server/app/main/api/internal/svc"
 	"tyc-server/app/main/api/internal/types"
 	"tyc-server/app/main/model"
@@ -159,33 +160,29 @@ func (l *PaySuccessNotifyUserHandler) handleError(ctx context.Context, err error
 			return asynq.SkipRetry
 		}
 
+		payRefundRequest := &service.RefundRequest{
+			OrderId:      order.Id,
+			RefundAmount: order.Amount,
+			Reason:       "查询失败退款",
+		}
 		// 退款
 		if order.PaymentPlatform == "wechat" {
-			refundErr := l.svcCtx.WechatPayService.WeChatRefund(ctx, order.OrderNo, order.Amount, order.Amount)
+			refundResp, refundErr := l.svcCtx.PayService.Refund(ctx, payRefundRequest)
 			if refundErr != nil {
 				logx.Error(refundErr)
 				return asynq.SkipRetry
 			}
+			if refundResp.Status == "success" {
+				// 直接成功
+			} else {
+				return asynq.SkipRetry
+			}
 		} else {
-			refund, refundErr := l.svcCtx.AlipayService.AliRefund(ctx, order.OrderNo, order.Amount)
+			_, refundErr := l.svcCtx.PayService.Refund(ctx, payRefundRequest)
 			if refundErr != nil {
 				logx.Error(refundErr)
 				return asynq.SkipRetry
 			}
-			if refund.IsSuccess() {
-				logx.Errorf("支付宝退款成功, orderID: %d", order.Id)
-				// 更新订单状态为退款
-				order.Status = "refunded"
-				updateOrderErr := l.svcCtx.OrderModel.UpdateWithVersion(ctx, nil, order)
-				if updateOrderErr != nil {
-					logx.Errorf("更新订单状态失败，订单ID: %d, 错误: %v", order.Id, updateOrderErr)
-					return fmt.Errorf("更新订单状态失败: %v", updateOrderErr)
-				}
-				return asynq.SkipRetry
-			} else {
-				logx.Errorf("支付宝退款失败:%v", refundErr)
-				return asynq.SkipRetry
-			}
 			// 直接成功
 		}