优化交易状态检查逻辑

web/handlers/user.go

@@ -163,154 +163,6 @@ type RechargeConfirmResp struct {
 	Status string `json:"status"`
 }
 
-func RechargePrepareAlipay(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 err
-	}
-	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: time.Now().Add(30 * time.Minute),
-			Type:     trade2.TypeRecharge,
-			Method:   trade2.MethodAlipay,
-			Platform: req.Platform,
-		})
-		return err
-	})
-	if err != nil {
-		return err
-	}
-
-	// 返回结果
-	return c.JSON(RechargePrepareResp{
-		TradeNo: result.TradeNo,
-		PayURL:  result.PayURL,
-	})
-}
-
-func RechargeConfirmAlipay(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.VerifyTrade(&s.TradeVerifyData{
-		TradeNo: req.TradeNo,
-		Method:  trade2.MethodAlipay,
-	})
-	if err != nil {
-		return err
-	}
-
-	// 更新数据库
-	err = s.User.RechargeConfirm(req.TradeNo, result)
-	if err != nil {
-		return err
-	}
-
-	return c.JSON(fiber.Map{"status": "success"})
-}
-
-func RechargePrepareWechat(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 err
-	}
-	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:   trade2.MethodWeChat,
-			Platform: req.Platform,
-		})
-		return err
-	})
-	if err != nil {
-		return err
-	}
-
-	// 返回结果
-	return c.JSON(RechargePrepareResp{
-		TradeNo: result.TradeNo,
-		PayURL:  result.PayURL,
-	})
-}
-
-func RechargeConfirmWechat(c *fiber.Ctx) error {
-	// 检查权限
-	_, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
-	if err != nil {
-		return err
-	}
-
-	// 解析请求参数
-	req := new(struct {
-		TradeNo string `json:"trade_no" validate:"required"`
-	})
-	if err := c.BodyParser(req); err != nil {
-		return err
-	}
-
-	// 验证支付结果
-	result, err := s.Trade.VerifyTrade(&s.TradeVerifyData{
-		TradeNo: req.TradeNo,
-		Method:  trade2.MethodWeChat,
-	})
-	if err != nil {
-		return err
-	}
-
-	// 更新数据库
-	err = s.User.RechargeConfirm(req.TradeNo, result)
-	if err != nil {
-		return err
-	}
-
-	return c.JSON(fiber.Map{"status": "success"})
-}
-
 func RechargePrepare(c *fiber.Ctx) error {
 	// 检查权限
 	authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
@@ -367,7 +219,7 @@ func RechargeComplete(c *fiber.Ctx) error {
 	}
 
 	// 验证支付结果
-	result, err := s.Trade.VerifyTrade(&s.TradeVerifyData{
+	result, err := s.Trade.CheckTradeIfCreated(&s.CheckTradeData{
 		TradeNo: req.TradeNo,
 		Method:  trade2.MethodSft,
 	})