完善商福通支付接口，修复证书加载问题；数据库扩展支付平台字段并更新支付信息保存逻辑；日志中间件异步记录日志

web/handlers/user.go

@@ -1,8 +1,10 @@
 package handlers
 
 import (
+	"fmt"
 	"github.com/shopspring/decimal"
 	"platform/web/auth"
+	"platform/web/core"
 	trade2 "platform/web/domains/trade"
 	m "platform/web/models"
 	q "platform/web/queries"
@@ -143,7 +145,9 @@ func UpdatePassword(c *fiber.Ctx) error {
 // region /recharge
 
 type RechargePrepareReq struct {
-	Amount string `json:"amount" validate:"required,numeric"`
+	Amount   string          `json:"amount" validate:"required,numeric"`
+	Platform trade2.Platform `json:"platform" validate:"required"`
+	Method   trade2.Method   `json:"method" validate:"required"`
 }
 
 type RechargePrepareResp struct {
@@ -159,7 +163,6 @@ type RechargeConfirmResp struct {
 	Status string `json:"status"`
 }
 
-// RechargePrepareAlipay 通过支付宝充值
 func RechargePrepareAlipay(c *fiber.Ctx) error {
 	// 检查权限
 	authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
@@ -181,12 +184,13 @@ func RechargePrepareAlipay(c *fiber.Ctx) error {
 	}
 	var result *s.TradeCreateResult
 	err = q.Q.Transaction(func(tx *q.Query) error {
-		result, err = s.Trade.SendCreateTradeByQrcode(tx, authContext.Payload.Id, now, &s.TradeCreateData{
+		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
 	})
@@ -215,7 +219,7 @@ func RechargeConfirmAlipay(c *fiber.Ctx) error {
 	}
 
 	// 验证支付结果
-	result, err := s.Trade.VerifyCreateTrade(&s.TradeVerifyData{
+	result, err := s.Trade.VerifyTrade(&s.TradeVerifyData{
 		TradeNo: req.TradeNo,
 		Method:  trade2.MethodAlipay,
 	})
@@ -253,12 +257,13 @@ func RechargePrepareWechat(c *fiber.Ctx) error {
 	}
 	var result *s.TradeCreateResult
 	err = q.Q.Transaction(func(tx *q.Query) error {
-		result, err = s.Trade.SendCreateTradeByQrcode(tx, authContext.Payload.Id, now, &s.TradeCreateData{
+		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
 	})
@@ -289,7 +294,82 @@ func RechargeConfirmWechat(c *fiber.Ctx) error {
 	}
 
 	// 验证支付结果
-	result, err := s.Trade.VerifyCreateTrade(&s.TradeVerifyData{
+	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{})
+	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 RechargeConfirm(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,
 	})