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

修复支付接口重复提交的响应问题，完善全局异常处理逻辑

Browse Source
This commit is contained in:
luorijun
2025-08-15 18:11:35 +08:00
parent 5541e16f0d
commit 91385880f2
6 changed files with 1345 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
web/services/trade.go
View File

@@ -254,7 +254,7 @@ func (s *tradeService) CreateTrade(uid int32, now time.Time, data *CreateTradeDa
}, nil
}
func (s *tradeService) CompleteTrade(data *CheckTradeData) error {
func (s *tradeService) CompleteTrade(data *ModifyTradeData) error {
return g.Redsync.WithLock(tradeLockKey(data.TradeNo), func() error {
// 检查订单状态
@@ -306,7 +306,8 @@ func completeTrade(data *OnTradeCompletedData) (*m.Trade, error) {
var paidAt = data.Time
// 获取交易信息
trade, err := q.Trade.
var err error
trade, err = q.Trade.
Where(q.Trade.InnerNo.Eq(tradeNo)).
Take()
if err != nil {
@@ -318,7 +319,7 @@ func completeTrade(data *OnTradeCompletedData) (*m.Trade, error) {
case trade2.StatusCanceled:
return core.NewBizErr("交易已取消")
case trade2.StatusSuccess:
return core.NewBizErr("交易已完成")
return nil // 跳过更新交易信息
case trade2.StatusPending:
}
@@ -337,7 +338,11 @@ func completeTrade(data *OnTradeCompletedData) (*m.Trade, error) {
return nil
})
return trade, err
if err != nil {
return nil, err
} else {
return trade, err
}
}
func afterTradeComplete(trade *m.Trade) error {
@@ -479,7 +484,7 @@ func (s *tradeService) OnTradeRefunded(q *q.Query, tradeNo string, now time.Time
panic("todo")
}
func (s *tradeService) CheckTrade(data *CheckTradeData) (*CheckTradeResult, error) {
func (s *tradeService) CheckTrade(data *ModifyTradeData) (*CheckTradeResult, error) {
var tradeNo = data.TradeNo
var method = data.Method
@@ -619,8 +624,8 @@ func (s *tradeService) CheckTrade(data *CheckTradeData) (*CheckTradeResult, erro
return result, nil
}
func (s *tradeService) ConfirmTradeCompleted(data *CheckTradeData) (*TradeSuccessResult, error) {
rs, err := Trade.CheckTrade(&CheckTradeData{
func (s *tradeService) ConfirmTradeCompleted(data *ModifyTradeData) (*TradeSuccessResult, error) {
rs, err := Trade.CheckTrade(&ModifyTradeData{
TradeNo: data.TradeNo,
Method: data.Method,
})
@@ -638,8 +643,8 @@ func (s *tradeService) ConfirmTradeCompleted(data *CheckTradeData) (*TradeSucces
return rs.Success, nil
}
func (s *tradeService) ConfirmTradeCanceled(data *CheckTradeData) error {
rs, err := Trade.CheckTrade(&CheckTradeData{
func (s *tradeService) ConfirmTradeCanceled(data *ModifyTradeData) error {
rs, err := Trade.CheckTrade(&ModifyTradeData{
TradeNo: data.TradeNo,
Method: data.Method,
})
@@ -657,8 +662,8 @@ func (s *tradeService) ConfirmTradeCanceled(data *CheckTradeData) error {
return nil
}
func (s *tradeService) ConfirmTradeRefunded(data *CheckTradeData) error {
rs, err := Trade.CheckTrade(&CheckTradeData{
func (s *tradeService) ConfirmTradeRefunded(data *ModifyTradeData) error {
rs, err := Trade.CheckTrade(&ModifyTradeData{
TradeNo: data.TradeNo,
Method: data.Method,
})
@@ -697,9 +702,9 @@ type CreateTradeResult struct {
PaymentUrl string
}
type CheckTradeData struct {
TradeNo string
Method trade2.Method
type ModifyTradeData struct {
TradeNo string `json:"trade_no" validate:"required"`
Method trade2.Method `json:"method" validate:"required"`
}
type CheckTradeResult struct {