lanhu/platform
2
0
Fork 0
Code Issues Actions Packages Releases 12 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

40
web/services/resource.go
View File

@@ -87,7 +87,7 @@ func (s *resourceService) CreateResource(uid int32, now time.Time, ser *CreateRe
return nil
}
func (s *resourceService) PrepareResource(uid int32, now time.Time, method trade2.Method, ser *CreateResourceSerializer) (*TransactionPrepareResult, error) {
func (s *resourceService) PrepareResource(uid int32, now time.Time, method trade2.Method, ser *CreateResourceSerializer) (*TradeCreateResult, error) {
data, err := ser.ToData()
if err != nil {
@@ -98,12 +98,12 @@ func (s *resourceService) PrepareResource(uid int32, now time.Time, method trade
amount := data.GetPrice()
// 保存到数据库
var result *TransactionPrepareResult
var result *TradeCreateResult
err = q.Q.Transaction(func(q *q.Query) error {
var err error
// 生成交易订单
result, err = Transaction.PrepareTransaction(q, uid, now, &TransactionPrepareData{
result, err = Trade.SendCreateTradeByQrcode(q, uid, now, &TradeCreateData{
Subject: "购买套餐 - " + name,
Amount: amount,
ExpireAt: time.Now().Add(30 * time.Minute),
@@ -140,7 +140,7 @@ func (s *resourceService) PrepareResource(uid int32, now time.Time, method trade
return result, nil
}
func (s *resourceService) CompleteResource(tradeNo string, now time.Time, opResult ...*TransactionVerifyResult) error {
func (s *resourceService) CompleteResource(tradeNo string, now time.Time, opResult ...*TradeSuccessResult) error {
// 获取请求缓存
reqStr, err := g.Redis.Get(context.Background(), tradeNo).Result()
@@ -153,12 +153,12 @@ func (s *resourceService) CompleteResource(tradeNo string, now time.Time, opResu
}
// 检查交易结果
var rs *TransactionVerifyResult
var rs *TradeSuccessResult
if len(opResult) > 0 && opResult[0] != nil {
rs = opResult[0]
} else {
var err error
rs, err = Transaction.VerifyTransaction(&TransactionVerifyData{
rs, err = Trade.VerifyTrade(&TradeVerifyData{
TradeNo: tradeNo,
Method: cache.Method,
})
@@ -175,10 +175,19 @@ func (s *resourceService) CompleteResource(tradeNo string, now time.Time, opResu
// 保存交易信息
err = q.Q.Transaction(func(q *q.Query) error {
// 完成交易
_, err = Trade.OnTradeCreated(q, &OnTradeCreateData{
TradeNo: tradeNo,
TradeSuccessResult: *rs,
})
if err != nil {
return fmt.Errorf("完成交易失败: %w", err)
}
// 保存套餐
resource, err := createResource(q, cache.Uid, now, data)
if err != nil {
return err
return fmt.Errorf("创建套餐失败: %w", err)
}
// 更新账单
@@ -189,22 +198,13 @@ func (s *resourceService) CompleteResource(tradeNo string, now time.Time, opResu
ResourceID: &resource.ID,
})
if err != nil {
return err
}
// 完成交易
_, err = Transaction.CompleteTransaction(q, &TransactionCompleteData{
TradeNo: tradeNo,
TransactionVerifyResult: *rs,
})
if err != nil {
return err
return fmt.Errorf("更新账单失败: %w", err)
}
// 删除缓存
err = g.Redis.Del(context.Background(), tradeNo).Err()
if err != nil {
return err
return fmt.Errorf("删除缓存失败: %w", err)
}
return nil
@@ -229,14 +229,14 @@ func (s *resourceService) CancelResource(tradeNo string, now time.Time, opRevoke
// 取消交易
if len(opRevoked) <= 0 {
err = Transaction.RevokeTransaction(tradeNo, cache.Method)
err = Trade.SendCancelTrade(tradeNo, cache.Method)
if err != nil {
return err
}
}
// 更新订单状态
err = Transaction.FinishTransaction(q.Q, tradeNo, now)
err = Trade.OnTradeCanceled(q.Q, tradeNo, now)
if err != nil {
return err
}

236
web/services/transaction.go → web/services/trade.go
View File

@@ -16,6 +16,7 @@ import (
"platform/web/globals/orm"
m "platform/web/models"
q "platform/web/queries"
"platform/web/tasks"
"time"
"github.com/smartwalle/alipay/v3"
@@ -23,12 +24,12 @@ import (
"gorm.io/gorm"
)
var Transaction = &transactionService{}
var Trade = &tradeService{}
type transactionService struct {
type tradeService struct {
}
func (s *transactionService) PrepareTransaction(q *q.Query, uid int32, now time.Time, data *TransactionPrepareData) (*TransactionPrepareResult, error) {
func (s *tradeService) SendCreateTradeByQrcode(q *q.Query, uid int32, now time.Time, data *TradeCreateData) (*TradeCreateResult, error) {
var subject = data.Subject
var expire = data.ExpireAt
var tType = data.Type
@@ -184,15 +185,118 @@ func (s *transactionService) PrepareTransaction(q *q.Query, uid int32, now time.
return nil, err
}
return &TransactionPrepareResult{
// 提交异步任务更新订单状态
_, err = g.Asynq.Enqueue(tasks.NewUpdateTrade(tradeNo, method))
if err != nil {
return nil, err
}
return &TradeCreateResult{
TradeNo: tradeNo,
PayURL: payUrl,
Bill: &bill,
Trade: &trade,
}, nil
}
func (s *tradeService) SendCreateTradeByRedirect() {
panic("todo")
}
func (s *transactionService) VerifyTransaction(data *TransactionVerifyData) (*TransactionVerifyResult, error) {
func (s *tradeService) OnTradeCreated(q *q.Query, data *OnTradeCreateData) (*m.Trade, error) {
var transId = data.TransId
var tradeNo = data.TradeNo
var payment = data.Payment
var paidAt = data.Time
// 获取交易信息
trade, err := q.Trade.
Where(q.Trade.InnerNo.Eq(tradeNo)).
First()
if err != nil {
return nil, err
}
// 检查交易状态
switch trade2.Status(trade.Status) {
// 如果已退款或取消，则返回错误
case trade2.StatusCanceled, trade2.StatusRefunded:
return nil, errors.New("交易已取消或已退款")
// 如果是未支付，则更新支付状态
case trade2.StatusPending:
trade.Status = int32(trade2.StatusSuccess)
trade.OuterNo = &transId
trade.Payment = payment
trade.PaidAt = u.P(orm.LocalDateTime(paidAt))
trade.PayURL = u.P("")
_, err = q.Trade.Updates(trade)
if err != nil {
return nil, err
}
case trade2.StatusSuccess:
}
return trade, nil
}
func (s *tradeService) SendCancelTrade(tradeNo string, method trade2.Method) error {
switch method {
case trade2.MethodAlipay:
resp, err := g.Alipay.TradeCancel(context.Background(), alipay.TradeCancel{
OutTradeNo: tradeNo,
})
if err != nil {
return err
}
if resp.Code != alipay.CodeSuccess {
slog.Warn("支付宝交易取消失败", "code", resp.Code, "sub_code", resp.SubCode, "msg", resp.Msg)
return errors.New("交易取消失败")
}
case trade2.MethodWeChat:
resp, err := g.WechatPay.Native.CloseOrder(context.Background(), native.CloseOrderRequest{
Mchid: &env.WechatPayMchId,
OutTradeNo: &tradeNo,
})
if err != nil {
return err
}
if resp.Response.StatusCode != http.StatusNoContent {
body, _ := io.ReadAll(resp.Response.Body)
slog.Warn("微信交易取消失败", "code", resp.Response.StatusCode, "body", string(body))
return errors.New("交易取消失败")
}
}
return nil
}
func (s *tradeService) OnTradeCanceled(q *q.Query, tradeNo string, now time.Time) error {
_, err := q.Trade.
Where(q.Trade.InnerNo.Eq(tradeNo)).
Select(q.Trade.Status, q.Trade.CancelAt, q.Trade.PayURL).
Updates(m.Trade{
Status: int32(trade2.StatusCanceled),
CancelAt: u.P(orm.LocalDateTime(now)),
PayURL: u.P(""),
})
if err != nil {
return err
}
return nil
}
func (s *tradeService) SendRefundTrade(tradeNo string, method trade2.Method) error {
panic("todo")
}
func (s *tradeService) OnTradeRefunded(q *q.Query, tradeNo string, now time.Time) error {
panic("todo")
}
func (s *tradeService) VerifyTrade(data *TradeVerifyData) (*TradeSuccessResult, error) {
var tradeNo = data.TradeNo
var method = data.Method
@@ -253,104 +357,14 @@ func (s *transactionService) VerifyTransaction(data *TransactionVerifyData) (*Tr
return nil, ErrTransactionNotSupported
}
return &TransactionVerifyResult{
return &TradeSuccessResult{
TransId: transId,
Payment: payment,
Time: paidAt,
}, nil
}
func (s *transactionService) CompleteTransaction(q *q.Query, data *TransactionCompleteData) (*TransactionCompleteResult, error) {
var transId = data.TransId
var tradeNo = data.TradeNo
var payment = data.Payment
var paidAt = data.Time
// 获取交易信息
trade, err := q.Trade.
Where(q.Trade.InnerNo.Eq(tradeNo)).
First()
if err != nil {
return nil, err
}
// 检查交易状态
switch trade2.Status(trade.Status) {
// 如果已退款或取消，则返回错误
case trade2.StatusCanceled, trade2.StatusRefunded:
return nil, errors.New("交易已取消或已退款")
// 如果是未支付，则更新支付状态
case trade2.StatusPending:
trade.Status = int32(trade2.StatusSuccess)
trade.OuterNo = &transId
trade.Payment = payment
trade.PaidAt = u.P(orm.LocalDateTime(paidAt))
trade.PayURL = u.P("")
_, err = q.Trade.Updates(trade)
if err != nil {
return nil, err
}
case trade2.StatusSuccess:
}
return &TransactionCompleteResult{
Trade: trade,
}, nil
}
func (s *transactionService) RevokeTransaction(tradeNo string, method trade2.Method) error {
switch method {
case trade2.MethodAlipay:
resp, err := g.Alipay.TradeCancel(context.Background(), alipay.TradeCancel{
OutTradeNo: tradeNo,
})
if err != nil {
return err
}
if resp.Code != alipay.CodeSuccess {
slog.Warn("支付宝交易取消失败", "code", resp.Code, "sub_code", resp.SubCode, "msg", resp.Msg)
return errors.New("交易取消失败")
}
case trade2.MethodWeChat:
resp, err := g.WechatPay.Native.CloseOrder(context.Background(), native.CloseOrderRequest{
Mchid: &env.WechatPayMchId,
OutTradeNo: &tradeNo,
})
if err != nil {
return err
}
if resp.Response.StatusCode != http.StatusNoContent {
body, _ := io.ReadAll(resp.Response.Body)
slog.Warn("微信交易取消失败", "code", resp.Response.StatusCode, "body", string(body))
return errors.New("交易取消失败")
}
}
return nil
}
func (s *transactionService) FinishTransaction(q *q.Query, tradeNo string, now time.Time) error {
_, err := q.Trade.
Where(q.Trade.InnerNo.Eq(tradeNo)).
Select(q.Trade.Status, q.Trade.CancelAt, q.Trade.PayURL).
Updates(m.Trade{
Status: int32(trade2.StatusCanceled),
CancelAt: u.P(orm.LocalDateTime(now)),
PayURL: u.P(""),
})
if err != nil {
return err
}
return nil
}
type TransactionPrepareData struct {
type TradeCreateData struct {
Subject string
Amount decimal.Decimal
ExpireAt time.Time
@@ -359,40 +373,44 @@ type TransactionPrepareData struct {
CouponCode string
}
type TransactionPrepareResult struct {
type TradeCreateResult struct {
TradeNo string
PayURL string
Bill *m.Bill
Trade *m.Trade
}
type TransactionVerifyData struct {
type TradeVerifyData struct {
TradeNo string
Method trade2.Method
}
type TransactionVerifyResult struct {
type TradeSuccessResult struct {
TransId string
Payment decimal.Decimal
Time time.Time
}
type TransactionCompleteData struct {
type OnTradeCreateData struct {
TradeNo string
TransactionVerifyResult
TradeSuccessResult
}
type TransactionCompleteResult struct {
Trade *m.Trade
}
type TradeResult int
type TransactionErr string
const (
TradeSuccess TradeResult = iota + 1
TradeCanceled
TradeClosed
)
func (e TransactionErr) Error() string {
type TradeErr string
func (e TradeErr) Error() string {
return string(e)
}
var (
ErrTransactionNotPaid = TransactionErr("交易未支付")
ErrTransactionNotSupported = TransactionErr("不支持的支付方式")
ErrTransactionNotPaid = TradeErr("交易未支付")
ErrTransactionNotSupported = TradeErr("不支持的支付方式")
)

12
web/services/user.go
View File

@@ -8,14 +8,14 @@ var User = &userService{}
type userService struct{}
func (s *userService) RechargeConfirm(tradeNo string, verified *TransactionVerifyResult) error {
func (s *userService) RechargeConfirm(tradeNo string, verified *TradeSuccessResult) error {
err := q.Q.Transaction(func(tx *q.Query) error {
// 更新交易状态
result, err := Transaction.CompleteTransaction(tx, &TransactionCompleteData{
TradeNo: tradeNo,
TransactionVerifyResult: *verified,
trade, err := Trade.OnTradeCreated(tx, &OnTradeCreateData{
TradeNo: tradeNo,
TradeSuccessResult: *verified,
})
if err != nil {
return err
@@ -23,14 +23,14 @@ func (s *userService) RechargeConfirm(tradeNo string, verified *TransactionVerif
// 更新用户余额
user, err := tx.User.
Where(tx.User.ID.Eq(result.Trade.UserID)).Take()
Where(tx.User.ID.Eq(trade.UserID)).Take()
if err != nil {
return err
}
_, err = tx.User.
Where(tx.User.ID.Eq(user.ID)).
UpdateSimple(tx.User.Balance.Value(user.Balance.Add(result.Trade.Amount)))
UpdateSimple(tx.User.Balance.Value(user.Balance.Add(trade.Amount)))
if err != nil {
return err
}