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

web/handlers/resource.go

@@ -406,7 +406,7 @@ func StatisticResourceUsage(c *fiber.Ctx) error {
 }
 
 type CreateResourceReq struct {
-	s.CreateResourceData
+	*s.CreateResourceData
 }
 
 func CreateResource(c *fiber.Ctx) error {
@@ -424,70 +424,7 @@ func CreateResource(c *fiber.Ctx) error {
 	}
 
 	// 创建套餐
-	err = s.Resource.CreateResource(authCtx.Payload.Id, time.Now(), &req.CreateResourceData)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type PrepareResourceReq struct {
-	s.PrepareResourceData
-}
-
-type PrepareResourceResp struct {
-	TradeNo string `json:"trade_no"`
-	PayURL  string `json:"pay_url"`
-}
-
-func PrepareCreateResource(c *fiber.Ctx) error {
-
-	// 检查权限
-	authCtx, err := auth.NewProtect(c).Payload(auth.PayloadUser).Do()
-	if err != nil {
-		return err
-	}
-
-	// 解析请求参数
-	var req = new(PrepareResourceReq)
-	if err := g.Validator.Validate(c, req); err != nil {
-		return err
-	}
-
-	// 准备创建套餐
-	result, err := s.Resource.PrepareResource(authCtx.Payload.Id, time.Now(), &req.PrepareResourceData)
-	if err != nil {
-		return err
-	}
-
-	return c.JSON(PrepareResourceResp{
-		TradeNo: result.TradeNo,
-		PayURL:  result.PayURL,
-	})
-}
-
-type CompleteResourceReq struct {
-	TradeNo string `json:"trade_no" validate:"required"`
-}
-
-func CompleteCreateResource(c *fiber.Ctx) error {
-
-	// 检查权限
-	_, err := auth.NewProtect(c).Payload(auth.PayloadUser).Do()
-	if err != nil {
-		return err
-	}
-
-	// 解析请求参数
-	var req = new(CompleteResourceReq)
-	if err := g.Validator.Validate(c, req); err != nil {
-		return err
-	}
-
-	// 完成创建套餐
-	var now = time.Now()
-	err = s.Resource.CompleteResource(req.TradeNo, now)
+	err = s.Resource.CreateResourceByBalance(authCtx.Payload.Id, time.Now(), req.CreateResourceData)
 	if err != nil {
 		return err
 	}
@@ -503,12 +440,13 @@ func ResourcePrice(c *fiber.Ctx) error {
 	}
 
 	// 解析请求参数
-	var req = new(s.PrepareResourceData)
+	var req = new(CreateResourceReq)
 	if err := g.Validator.Validate(c, req); err != nil {
 		return err
 	}
 
+	// 获取套餐价格
 	return c.JSON(fiber.Map{
-		"price": req.GetPrice().StringFixed(2),
+		"price": req.GetAmount().StringFixed(2),
 	})
 }