team/tyc-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
liangzai 2025-06-03 21:50:29 +08:00
parent 740464a8ec
commit 0bc383eba4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/main/api/internal/logic/pay/paymentlogic.go
View File

@ -62,6 +62,7 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
orderReq := &service.CreateOrderRequest{ orderReq := &service.CreateOrderRequest{
PayMethod: payMethod, PayMethod: payMethod,
ProductEn: data.Product, ProductEn: data.Product,
OrderNo: outTradeNo,
} }
orderResp, err := l.svcCtx.PayService.CreateOrder(l.ctx, orderReq) orderResp, err := l.svcCtx.PayService.CreateOrder(l.ctx, orderReq)

11
app/main/api/internal/service/payService.go
View File

@ -116,7 +116,7 @@ func (p *PayService) CreateOrder(ctx context.Context, req *CreateOrderRequest) (
if err != nil { if err != nil {
return nil, fmt.Errorf("获取用户失败: %v", err) return nil, fmt.Errorf("获取用户失败: %v", err)
} }
var outTradeNo string outTradeNo := req.OrderNo
var orderID int64 var orderID int64
amount := product.SellPrice amount := product.SellPrice
if user.Inside == 1 { if user.Inside == 1 {
@ -129,15 +129,15 @@ func (p *PayService) CreateOrder(ctx context.Context, req *CreateOrderRequest) (
switch req.PayMethod { switch req.PayMethod {
case "alipay": case "alipay":
orderReq := &payment.AlipayCreateOrderRequest{ orderReq := &payment.AlipayCreateOrderRequest{
Amount: amount, Amount: amount,
Subject: product.ProductName, Subject: product.ProductName,
Platform: payment.PlatformH5, Platform: payment.PlatformH5,
OutTradeNo: outTradeNo,
} }
resp, err := p.alipayService.CreateOrder(ctx, orderReq) resp, err := p.alipayService.CreateOrder(ctx, orderReq)
if err != nil { if err != nil {
return fmt.Errorf("创建支付宝订单失败: %v", err) return fmt.Errorf("创建支付宝订单失败: %v", err)
} }
outTradeNo = resp.OrderNo
payData = resp.PayParams payData = resp.PayParams
case "wechat": case "wechat":
orderReq := &payment.Order{ orderReq := &payment.Order{
@ -465,6 +465,7 @@ const (
type CreateOrderRequest struct { type CreateOrderRequest struct {
PayMethod PayMethod `json:"pay_method"` // 支付方式：alipay, wechat, apple PayMethod PayMethod `json:"pay_method"` // 支付方式：alipay, wechat, apple
ProductEn string `json:"product_en"` // 商品英文名 ProductEn string `json:"product_en"` // 商品英文名
OrderNo string `json:"order_no"` // 订单号
} }
type CreateOrderResponse struct { type CreateOrderResponse struct {