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

README.md

@@ -1,13 +1,5 @@
 ## TODO
 
-pre 环境屏蔽外部配置后启动，主要用于检查和配置采集器
-
-支付回调需要判断可能重复调用的情况
-
-实现订单状态查询的 SSE 接口
-
-
-
 ### 长期
 
 更新支付状态后，缓存结果以便查询

web/error.go

@@ -18,6 +18,7 @@ func ErrorHandler(c *fiber.Ctx, err error) error {
 	var fiberErr *fiber.Error
 	var authErr auth.AuthenticationErr
 	var bizErr *core.BizErr
+	var servErr *core.ServErr
 
 	switch {
 
@@ -38,11 +39,14 @@ func ErrorHandler(c *fiber.Ctx, err error) error {
 		}
 		message = err.Error()
 
-	// 服务错误
+	// 已处理的业务错误
 	case errors.As(err, &bizErr):
 		code = fiber.StatusBadRequest
 		message = err.Error()
-		slog.Debug("服务错误", slog.Any(slog.SourceKey, bizErr.Source()))
+
+	case errors.As(err, &servErr):
+		code = fiber.StatusInternalServerError
+		message = err.Error()
 
 	// 所有未手动声明的错误类型
 	default:

web/handlers/trade.go

@@ -65,8 +65,7 @@ func TradeCreate(c *fiber.Ctx) error {
 }
 
 type TradeCompleteReq struct {
-	TradeNo string        `json:"trade_no" validate:"required"`
+	s.ModifyTradeData
-	Method  trade2.Method `json:"method" validate:"required"`
 }
 
 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 err
-		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": "完成交易失败"})
+	}
+
+	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{})

web/router.go

@@ -53,7 +53,7 @@ func ApplyRouters(app *fiber.App) {
 	trade := api.Group("/trade")
 	trade.Post("/create", handlers.TradeCreate)
 	trade.Post("/complete", handlers.TradeComplete)
-	trade.Post("/check", handlers.TradeCheckSSE)
+	trade.Post("/cancel", handlers.TradeCancel)
 
 	// 账单
 	bill := api.Group("/bill")

web/services/trade.go

@@ -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) {
+func (s *tradeService) ConfirmTradeCompleted(data *ModifyTradeData) (*TradeSuccessResult, error) {
-	rs, err := Trade.CheckTrade(&CheckTradeData{
+	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 {
+func (s *tradeService) ConfirmTradeCanceled(data *ModifyTradeData) error {
-	rs, err := Trade.CheckTrade(&CheckTradeData{
+	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 {
+func (s *tradeService) ConfirmTradeRefunded(data *ModifyTradeData) error {
-	rs, err := Trade.CheckTrade(&CheckTradeData{
+	rs, err := Trade.CheckTrade(&ModifyTradeData{
 		TradeNo: data.TradeNo,
 		Method:  data.Method,
 	})
@@ -697,9 +702,9 @@ type CreateTradeResult struct {
 	PaymentUrl string
 }
 
-type CheckTradeData struct {
+type ModifyTradeData struct {
-	TradeNo string
+	TradeNo string        `json:"trade_no" validate:"required"`
-	Method  trade2.Method
+	Method  trade2.Method `json:"method" validate:"required"`
 }
 
 type CheckTradeResult struct {