修复商福通接口签名编码逻辑；统一充值和创建套餐接口为聚合接口

web/handlers/resource.go

@@ -5,7 +5,6 @@ import (
 	"platform/web/auth"
 	"platform/web/core"
 	resource2 "platform/web/domains/resource"
-	trade2 "platform/web/domains/trade"
 	g "platform/web/globals"
 	"platform/web/globals/orm"
 	q "platform/web/queries"
@@ -242,7 +241,7 @@ func AllActiveResource(c *fiber.Ctx) error {
 // region 创建套餐
 
 type CreateResourceReq struct {
-	s.CreateResourceSerializer
+	s.CreateResourceData
 }
 
 func CreateResource(c *fiber.Ctx) error {
@@ -260,7 +259,7 @@ func CreateResource(c *fiber.Ctx) error {
 	}
 
 	// 创建套餐
-	err = s.Resource.CreateResource(authCtx.Payload.Id, time.Now(), &req.CreateResourceSerializer)
+	err = s.Resource.CreateResource(authCtx.Payload.Id, time.Now(), &req.CreateResourceData)
 	if err != nil {
 		return err
 	}
@@ -269,8 +268,7 @@ func CreateResource(c *fiber.Ctx) error {
 }
 
 type PrepareResourceReq struct {
-	Method trade2.Method `json:"method" validate:"required"`
-	s.CreateResourceSerializer
+	s.PrepareResourceData
 }
 
 type PrepareResourceResp struct {
@@ -293,7 +291,7 @@ func PrepareCreateResource(c *fiber.Ctx) error {
 	}
 
 	// 准备创建套餐
-	result, err := s.Resource.PrepareResource(authCtx.Payload.Id, time.Now(), &req.CreateResourceSerializer)
+	result, err := s.Resource.PrepareResource(authCtx.Payload.Id, time.Now(), &req.PrepareResourceData)
 	if err != nil {
 		return err
 	}
@@ -342,7 +340,7 @@ func ResourcePrice(c *fiber.Ctx) error {
 	}
 
 	// 解析请求参数
-	var req = new(s.CreateResourceSerializer)
+	var req = new(s.PrepareResourceData)
 	if err := g.Validator.Validate(c, req); err != nil {
 		return err
 	}

web/handlers/user.go

@@ -353,7 +353,7 @@ func RechargePrepare(c *fiber.Ctx) error {
 	})
 }
 
-func RechargeConfirm(c *fiber.Ctx) error {
+func RechargeComplete(c *fiber.Ctx) error {
 	// 检查权限
 	_, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
 	if err != nil {
@@ -361,9 +361,7 @@ func RechargeConfirm(c *fiber.Ctx) error {
 	}
 
 	// 解析请求参数
-	req := new(struct {
-		TradeNo string `json:"trade_no" validate:"required"`
-	})
+	req := new(RechargeConfirmReq)
 	if err := c.BodyParser(req); err != nil {
 		return err
 	}
@@ -371,7 +369,7 @@ func RechargeConfirm(c *fiber.Ctx) error {
 	// 验证支付结果
 	result, err := s.Trade.VerifyTrade(&s.TradeVerifyData{
 		TradeNo: req.TradeNo,
-		Method:  trade2.MethodWeChat,
+		Method:  trade2.MethodSft,
 	})
 	if err != nil {
 		return err