From 217ddad2a17fa120bc22506fe66678863b49a489 Mon Sep 17 00:00:00 2001
From: liangzai <2440983361@qq.com>
Date: Sun, 19 Jan 2025 10:32:41 +0800
Subject: [PATCH] feat(main): fix prepayId

---
 app/user/cmd/api/desc/pay/pay.api                   | 1 +
 app/user/cmd/api/internal/logic/pay/paymentlogic.go | 9 +++++++--
 app/user/cmd/api/internal/types/types.go            | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/user/cmd/api/desc/pay/pay.api b/app/user/cmd/api/desc/pay/pay.api
index 9f060e8..2d80db1 100644
--- a/app/user/cmd/api/desc/pay/pay.api
+++ b/app/user/cmd/api/desc/pay/pay.api
@@ -14,6 +14,7 @@ type (
 	}
 	PaymentResp {
 		prepayData interface{} `json:"prepay_data"`
+		prepayId string `json:"prepay_id"`
 		OrderID  int64  `json:"order_id"`
 	}
 )
diff --git a/app/user/cmd/api/internal/logic/pay/paymentlogic.go b/app/user/cmd/api/internal/logic/pay/paymentlogic.go
index 436b412..b91f686 100644
--- a/app/user/cmd/api/internal/logic/pay/paymentlogic.go
+++ b/app/user/cmd/api/internal/logic/pay/paymentlogic.go
@@ -132,6 +132,11 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
 	if transErr != nil {
 		return nil, transErr
 	}
-
-	return &types.PaymentResp{PrepayData: prepayData, OrderID: orderID}, nil
+	switch v := prepayData.(type) {
+	case string:
+		// 如果 prepayData 是字符串类型，直接返回
+		return &types.PaymentResp{PrepayId: v, OrderID: orderID}, nil
+	default:
+		return &types.PaymentResp{PrepayData: prepayData, OrderID: orderID}, nil
+	}
 }
diff --git a/app/user/cmd/api/internal/types/types.go b/app/user/cmd/api/internal/types/types.go
index 3ff9030..852328e 100644
--- a/app/user/cmd/api/internal/types/types.go
+++ b/app/user/cmd/api/internal/types/types.go
@@ -72,6 +72,7 @@ type PaymentReq struct {
 
 type PaymentResp struct {
 	PrepayData interface{} `json:"prepay_data"`
+	PrepayId   string      `json:"prepay_id"`
 	OrderID    int64       `json:"order_id"`
 }