fix(pay):修复支付功能响应格式错误
This commit is contained in:
1 parent
88200e9596
commit
5193e971fa
2 files changed
+36
-24
No files matched your search
@@ -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 {
|
||||
|
||||
@@ -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.
|
||||
|
||||
Reference in new issue
Block a user