From 5193e971fafedc37d162b3a222aa4509309638cc Mon Sep 17 00:00:00 2001
From: qian <wuchengqian5@163.com>
Date: Mon, 25 May 2026 23:35:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(pay):=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=93=8D=E5=BA=94=E6=A0=BC=E5=BC=8F=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/tenant/v1/order_tenant.go  | 18 ++++++++++++---
 internal/logic/tenant/order.go | 42 +++++++++++++++++-----------------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/api/tenant/v1/order_tenant.go b/api/tenant/v1/order_tenant.go
index 0ae1962..fc2a805 100644
--- a/api/tenant/v1/order_tenant.go
+++ b/api/tenant/v1/order_tenant.go
@@ -15,7 +15,10 @@ type TenantOrderCreateReq struct {
 }
 
 type TenantOrderCreateRes struct {
-	Data map[string]any `json:"data"`
+	ID          int64   `json:"id"`
+	OrderNo     string  `json:"order_no"`
+	FinalAmount float64 `json:"final_amount"`
+	Status      string  `json:"status"`
 }
 
 type TenantOrderPayReq struct {
@@ -26,7 +29,10 @@ type TenantOrderPayReq struct {
 }
 
 type TenantOrderPayRes struct {
-	Data map[string]any `json:"data"`
+	PaymentURL string            `json:"payment_url"`
+	PaymentNo  string            `json:"payment_no"`
+	Params     map[string]string `json:"params"`
+	IsRedirect bool              `json:"is_redirect"`
 }
 
 type TenantOrderListReq struct {
@@ -92,7 +98,13 @@ type TenantRechargeCreateReq struct {
 }
 
 type TenantRechargeCreateRes struct {
-	Data map[string]any `json:"data"`
+	OrderID     int64             `json:"order_id"`
+	OrderNo     string            `json:"order_no"`
+	PaymentURL  string            `json:"payment_url"`
+	PaymentNo   string            `json:"payment_no"`
+	Params      map[string]string `json:"params"`
+	IsRedirect  bool              `json:"is_redirect"`
+	FinalAmount float64           `json:"final_amount"`
 }
 
 type TenantPaymentInfoReq struct {
diff --git a/internal/logic/tenant/order.go b/internal/logic/tenant/order.go
index 2f9058f..9076dd3 100644
--- a/internal/logic/tenant/order.go
+++ b/internal/logic/tenant/order.go
@@ -131,12 +131,12 @@ func (s *sTenant) OrderCreate(ctx context.Context, req *v1.TenantOrderCreateReq)
 	}
 
 	id, _ := result.LastInsertId()
-	return &v1.TenantOrderCreateRes{Data: g.Map{
-		"id":           id,
-		"order_no":     orderNo,
-		"final_amount": amount,
-		"status":       "pending",
-	}}, nil
+	return &v1.TenantOrderCreateRes{
+		ID:          id,
+		OrderNo:     orderNo,
+		FinalAmount: amount,
+		Status:      "pending",
+	}, nil
 }
 
 // OrderCancel 取消订单
@@ -221,12 +221,12 @@ func (s *sTenant) OrderPay(ctx context.Context, req *v1.TenantOrderPayReq) (*v1.
 		return nil, err
 	}
 
-	return &v1.TenantOrderPayRes{Data: g.Map{
-		"payment_url": result.PaymentURL,
-		"payment_no":  result.PaymentNo,
-		"params":      result.Params,
-		"is_redirect": result.IsRedirect,
-	}}, nil
+	return &v1.TenantOrderPayRes{
+		PaymentURL: result.PaymentURL,
+		PaymentNo:  result.PaymentNo,
+		Params:     result.Params,
+		IsRedirect: result.IsRedirect,
+	}, nil
 }
 
 // PaymentInfo 获取租户可用的支付信息（渠道列表、金额选项、折扣）
@@ -380,15 +380,15 @@ func (s *sTenant) RechargeCreate(ctx context.Context, req *v1.TenantRechargeCrea
 		return nil, err
 	}
 
-	return &v1.TenantRechargeCreateRes{Data: g.Map{
-		"order_id":     orderID,
-		"order_no":     orderNo,
-		"payment_url":  payResult.PaymentURL,
-		"payment_no":   payResult.PaymentNo,
-		"params":       payResult.Params,
-		"is_redirect":  payResult.IsRedirect,
-		"final_amount": finalAmount,
-	}}, nil
+	return &v1.TenantRechargeCreateRes{
+		OrderID:     orderID,
+		OrderNo:     orderNo,
+		PaymentURL:  payResult.PaymentURL,
+		PaymentNo:   payResult.PaymentNo,
+		Params:      payResult.Params,
+		IsRedirect:  payResult.IsRedirect,
+		FinalAmount: finalAmount,
+	}, nil
 }
 
 // ExportOrders exports the tenant order list as CSV or Excel.