lanhu/platform
2
0
Fork 0
Code Issues Actions Packages Releases 13 Activity

重构交易相关逻辑，优化异步任务处理，更新支付状态查询逻辑

Browse Source
This commit is contained in:
luorijun
2025-06-03 09:53:50 +08:00
parent 41dcc14f5f
commit a9de63c3f9
9 changed files with 239 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/handlers/user.go
View File

@@ -179,9 +179,9 @@ func RechargePrepareAlipay(c *fiber.Ctx) error {
if err != nil {
return err
}
var result *s.TransactionPrepareResult
var result *s.TradeCreateResult
err = q.Q.Transaction(func(tx *q.Query) error {
result, err = s.Transaction.PrepareTransaction(tx, authContext.Payload.Id, now, &s.TransactionPrepareData{
result, err = s.Trade.SendCreateTradeByQrcode(tx, authContext.Payload.Id, now, &s.TradeCreateData{
Subject: "账户充值 - " + amount.StringFixed(2) + "元",
Amount: amount,
ExpireAt: time.Now().Add(30 * time.Minute),
@@ -215,7 +215,7 @@ func RechargeConfirmAlipay(c *fiber.Ctx) error {
}
// 验证支付结果
result, err := s.Transaction.VerifyTransaction(&s.TransactionVerifyData{
result, err := s.Trade.VerifyTrade(&s.TradeVerifyData{
TradeNo: req.TradeNo,
Method: trade2.MethodAlipay,
})
@@ -251,9 +251,9 @@ func RechargePrepareWechat(c *fiber.Ctx) error {
if err != nil {
return err
}
var result *s.TransactionPrepareResult
var result *s.TradeCreateResult
err = q.Q.Transaction(func(tx *q.Query) error {
result, err = s.Transaction.PrepareTransaction(tx, authContext.Payload.Id, now, &s.TransactionPrepareData{
result, err = s.Trade.SendCreateTradeByQrcode(tx, authContext.Payload.Id, now, &s.TradeCreateData{
Subject: "账户充值 - " + amount.StringFixed(2) + "元",
Amount: amount,
ExpireAt: now.Add(30 * time.Minute),
@@ -289,7 +289,7 @@ func RechargeConfirmWechat(c *fiber.Ctx) error {
}
// 验证支付结果
result, err := s.Transaction.VerifyTransaction(&s.TransactionVerifyData{
result, err := s.Trade.VerifyTrade(&s.TradeVerifyData{
TradeNo: req.TradeNo,
Method: trade2.MethodWeChat,
})