重构交易处理逻辑，合并充值与购买流程，优化交易状态管理；更新相关数据结构和接口

web/handlers/user.go

@@ -1,18 +1,12 @@
 package handlers
 
 import (
-	"fmt"
-	"github.com/shopspring/decimal"
+	"github.com/gofiber/fiber/v2"
+	"golang.org/x/crypto/bcrypt"
 	"platform/web/auth"
-	"platform/web/core"
-	trade2 "platform/web/domains/trade"
 	m "platform/web/models"
 	q "platform/web/queries"
 	s "platform/web/services"
-	"time"
-
-	"github.com/gofiber/fiber/v2"
-	"golang.org/x/crypto/bcrypt"
 )
 
 // region /update
@@ -141,99 +135,3 @@ func UpdatePassword(c *fiber.Ctx) error {
 }
 
 // endregion
-
-// region /recharge
-
-type RechargePrepareReq struct {
-	Amount   string          `json:"amount" validate:"required,numeric"`
-	Platform trade2.Platform `json:"platform" validate:"required"`
-	Method   trade2.Method   `json:"method" validate:"required"`
-}
-
-type RechargePrepareResp struct {
-	TradeNo string `json:"trade_no"`
-	PayURL  string `json:"pay_url"`
-}
-
-type RechargeConfirmReq struct {
-	TradeNo string `json:"trade_no" validate:"required"`
-}
-
-type RechargeConfirmResp struct {
-	Status string `json:"status"`
-}
-
-func RechargePrepare(c *fiber.Ctx) error {
-	// 检查权限
-	authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
-	if err != nil {
-		return err
-	}
-
-	// 解析请求参数
-	req := new(RechargePrepareReq)
-	if err := c.BodyParser(req); err != nil {
-		return err
-	}
-
-	// 保存交易信息
-	var now = time.Now()
-	amount, err := decimal.NewFromString(req.Amount)
-	if err != nil {
-		return core.NewBizErr(fmt.Sprintf("金额格式错误: %s", err.Error()))
-	}
-	var result *s.TradeCreateResult
-	err = q.Q.Transaction(func(tx *q.Query) error {
-		result, err = s.Trade.CreateTrade(tx, authContext.Payload.Id, now, &s.TradeCreateData{
-			Subject:  "账户充值 - " + amount.StringFixed(2) + "元",
-			Amount:   amount,
-			ExpireAt: now.Add(30 * time.Minute),
-			Type:     trade2.TypeRecharge,
-			Method:   req.Method,
-			Platform: req.Platform,
-		})
-		return err
-	})
-	if err != nil {
-		return err
-	}
-
-	// 返回结果
-	return c.JSON(RechargePrepareResp{
-		TradeNo: result.TradeNo,
-		PayURL:  result.PayURL,
-	})
-}
-
-func RechargeComplete(c *fiber.Ctx) error {
-	// 检查权限
-	_, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
-	if err != nil {
-		return err
-	}
-
-	// 解析请求参数
-	req := new(RechargeConfirmReq)
-	if err := c.BodyParser(req); err != nil {
-		return err
-	}
-
-	// 验证支付结果
-	result, err := s.Trade.CheckTradeIfCreated(&s.CheckTradeData{
-		TradeNo: req.TradeNo,
-		Method:  trade2.MethodSft,
-	})
-	if err != nil {
-		return err
-	}
-
-	// 更新数据库
-	err = s.User.RechargeConfirm(req.TradeNo, result)
-	if err != nil {
-		return err
-	}
-
-	return c.JSON(fiber.Map{"status": "success"})
-}
-
-// endregion