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

This commit is contained in:
2025-08-15 18:11:35 +08:00
parent 5541e16f0d
commit 91385880f2
6 changed files with 1345 additions and 40 deletions

View File

@@ -65,8 +65,7 @@ func TradeCreate(c *fiber.Ctx) error {
}
type TradeCompleteReq struct {
TradeNo string `json:"trade_no" validate:"required"`
Method trade2.Method `json:"method" validate:"required"`
s.ModifyTradeData
}
func TradeComplete(c *fiber.Ctx) error {
@@ -83,13 +82,39 @@ func TradeComplete(c *fiber.Ctx) error {
}
// 检查订单状态
err = s.Trade.CompleteTrade(&s.CheckTradeData{
err = s.Trade.CompleteTrade(&s.ModifyTradeData{
TradeNo: req.TradeNo,
Method: req.Method,
})
if err != nil {
slog.Error("完成交易失败", "trade_no", req.TradeNo, "method", req.Method, "error", err)
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": "完成交易失败"})
return err
}
return c.SendStatus(fiber.StatusNoContent)
}
type TradeCancelReq struct {
s.ModifyTradeData
}
func TradeCancel(c *fiber.Ctx) error {
// 检查权限
_, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
return err
}
// 解析请求参数
req := new(TradeCancelReq)
if err := g.Validator.Validate(c, req); err != nil {
return err
}
// 取消交易
err = s.Trade.CancelTrade(req.TradeNo, req.Method, time.Now())
if err != nil {
slog.Error("取消交易失败", "trade_no", req.TradeNo, "error", err)
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": "取消交易失败"})
}
return c.SendStatus(fiber.StatusNoContent)
@@ -99,16 +124,6 @@ type TradeCheckReq struct {
tasks.CancelTradeData
}
func TradeCheckSSE(c *fiber.Ctx) error {
// 设置响应头
c.Set("Content-Type", "text/event-stream")
c.Set("Cache-Control", "no-cache")
c.Set("Connection", "keep-alive")
return nil
}
func TradeCancelByTask(c *fiber.Ctx) error {
// 检查权限
_, err := auth.Protect(c, []auth.PayloadType{auth.PayloadInternalServer}, []string{})