添加微信支付支持，重构资源创建逻辑，更新支付宝相关配置，移除账单状态字段

web/globals/alipay.go

@@ -23,7 +23,7 @@ func InitAlipay() {
 		panic("加载支付宝公钥失败: " + err.Error())
 	}
 
-	err = client.SetEncryptKey(env.AlipayEncryptKey)
+	err = client.SetEncryptKey(env.AlipayApiCert)
 	if err != nil {
 		panic("设置支付宝加密密钥失败: " + err.Error())
 	}

web/globals/wechat.go

@@ -0,0 +1,47 @@
+package globals
+
+import (
+	"context"
+	"platform/pkg/env"
+
+	"github.com/wechatpay-apiv3/wechatpay-go/core"
+	"github.com/wechatpay-apiv3/wechatpay-go/core/option"
+	"github.com/wechatpay-apiv3/wechatpay-go/services/payments/native"
+	"github.com/wechatpay-apiv3/wechatpay-go/utils"
+)
+
+var WechatPay *WechatPayClient
+
+type WechatPayClient struct {
+	Native *native.NativeApiService
+}
+
+func InitWechatPay() {
+
+	appPrivateKey, err := utils.LoadPrivateKey(env.WechatPayMchPrivateKeyPath)
+	if err != nil {
+		panic(err)
+	}
+
+	wechatPublicKey, err := utils.LoadPublicKey(env.WechatPayPublicKeyPath)
+	if err != nil {
+		panic(err)
+	}
+
+	client, err := core.NewClient(context.Background(),
+		option.WithWechatPayPublicKeyAuthCipher(
+			env.WechatPayMchId,
+			env.WechatPayMchPrivateKeySerial,
+			appPrivateKey,
+			env.WechatPayPublicKeyId,
+			wechatPublicKey,
+		),
+	)
+	if err != nil {
+		panic(err)
+	}
+
+	WechatPay = &WechatPayClient{
+		Native: &native.NativeApiService{Client: client},
+	}
+}

web/handlers/bill.go

@@ -16,7 +16,6 @@ type ListBillReq struct {
 	common.PageReq
 	BillNo       *string    `json:"bill_no"`
 	Type         *int       `json:"type"`
-	Status       *int       `json:"status"`
 	CreateAfter  *time.Time `json:"create_after"`
 	CreateBefore *time.Time `json:"create_before"`
 }
@@ -39,9 +38,6 @@ func ListBill(c *fiber.Ctx) error {
 	do := q.Bill.
 		Where(q.Bill.UserID.Eq(authContext.Payload.Id))
 
-	if req.Status != nil {
-		do = do.Where(q.Bill.Status.Eq(int32(*req.Status)))
-	}
 	if req.Type != nil {
 		do = do.Where(q.Bill.Type.Eq(int32(*req.Type)))
 	}

web/handlers/channel.go

@@ -3,12 +3,9 @@ package handlers
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 	"platform/web/auth"
 	q "platform/web/queries"
 	"platform/web/services"
-	"strconv"
-	"strings"
 
 	"github.com/gofiber/fiber/v2"
 )
@@ -114,124 +111,3 @@ func RemoveChannels(c *fiber.Ctx) error {
 }
 
 // endregion
-
-// region CreateChannel(GET)
-
-type CreateChannelGetReq struct {
-	ResourceId      int32                    `query:"i" validate:"required"`
-	Protocol        services.ChannelProtocol `query:"x" validate:"required,oneof=socks5 http https"`
-	AuthType        services.ChannelAuthType `query:"t" validate:"required,oneof=0 1"`
-	Count           int                      `query:"n" validate:"required"`
-	Prov            string                   `query:"a" validate:"required"`
-	City            string                   `query:"b" validate:"required"`
-	Isp             string                   `query:"s" validate:"required"`
-	ResultType      CreateChannelResultType  `query:"rt" validate:"required,oneof=json text"`
-	ResultBreaker   []rune                   `query:"rb"`
-	ResultSeparator []rune                   `query:"rs"`
-}
-
-func CreateChannelGet(c *fiber.Ctx) error {
-	req := new(CreateChannelGetReq)
-	if err := c.QueryParser(req); err != nil {
-		return err
-	}
-	slog.Info("CreateChannelGet", "req", *req)
-
-	// 验证用户身份
-	resource, err := q.Resource.Debug().Where(q.Resource.ID.Eq(req.ResourceId)).Take()
-	if err != nil {
-		return err
-	}
-	whitelists, err := q.Whitelist.Debug().Where(q.Whitelist.UserID.Eq(resource.UserID)).Find()
-	if err != nil {
-		return err
-	}
-	if len(whitelists) == 0 {
-		return fiber.NewError(fiber.StatusForbidden, fmt.Sprintf("forbidden %s", c.IP()))
-	}
-
-	var invalid bool
-	for _, whitelist := range whitelists {
-		invalid = whitelist.Host == c.IP()
-		if invalid {
-			break
-		}
-	}
-	if !invalid {
-		return fiber.NewError(fiber.StatusForbidden, fmt.Sprintf("forbidden %s", c.IP()))
-	}
-
-	user, err := q.User.Debug().Where(q.User.ID.Eq(resource.UserID)).Take()
-	if err != nil {
-		return err
-	}
-
-	authCtx := &services.AuthContext{
-		Payload: services.Payload{
-			Id:     user.ID,
-			Type:   services.PayloadUser,
-			Name:   user.Name,
-			Avatar: user.Avatar,
-		},
-	}
-
-	if req.ResultType == "" {
-		req.ResultType = CreateChannelResultTypeText
-	}
-	if req.ResultBreaker == nil {
-		req.ResultBreaker = []rune("\r\n")
-	}
-	if req.ResultSeparator == nil {
-		req.ResultSeparator = []rune("|")
-	}
-
-	// 建立连接通道
-	result, err := services.Channel.CreateChannel(
-		c.Context(),
-		authCtx,
-		req.ResourceId,
-		req.Protocol,
-		req.AuthType,
-		req.Count,
-		services.NodeFilterConfig{
-			Isp:  req.Isp,
-			Prov: req.Prov,
-			City: req.City,
-		},
-	)
-	if err != nil {
-		return err
-	}
-
-	var separator = string(req.ResultSeparator)
-	switch req.ResultType {
-	case CreateChannelResultTypeJson:
-		return c.JSON(fiber.Map{
-			"code": 1,
-			"data": result,
-		})
-	default:
-		var breaker = string(req.ResultBreaker)
-		var str = strings.Builder{}
-		for _, info := range result {
-
-			str.WriteString(info.Host)
-
-			str.WriteString(separator)
-			str.WriteString(strconv.Itoa(info.Port))
-
-			if info.Username != nil {
-				str.WriteString(separator)
-				str.WriteString(*info.Username)
-			}
-			if info.Password != nil {
-				str.WriteString(separator)
-				str.WriteString(*info.Password)
-			}
-			str.WriteString(breaker)
-		}
-		return c.SendString(str.String())
-	}
-}
-
-// endregion

web/handlers/resource.go

@@ -1,24 +1,19 @@
 package handlers
 
 import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"platform/pkg/rds"
+	"platform/pkg/env"
 	"platform/pkg/u"
 	"platform/web/auth"
 	"platform/web/common"
 	g "platform/web/globals"
-	m "platform/web/models"
 	q "platform/web/queries"
-	"platform/web/services"
+	s "platform/web/services"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/smartwalle/alipay/v3"
+	"github.com/wechatpay-apiv3/wechatpay-go/services/payments/native"
 )
 
 // region ListResourcePss
@@ -37,7 +32,7 @@ type ListResourcePssReq struct {
 // ListResourcePss 获取套餐列表
 func ListResourcePss(c *fiber.Ctx) error {
 	// 检查权限
-	authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
 	if err != nil {
 		return err
 	}
@@ -110,7 +105,7 @@ type AllResourceReq struct {
 
 func AllResource(c *fiber.Ctx) error {
 	// 检查权限
-	authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
 	if err != nil {
 		return err
 	}
@@ -148,14 +143,10 @@ func AllResource(c *fiber.Ctx) error {
 
 // endregion
 
-// region CreateResource
+// region CreateResourcePrepared
 
 type CreateResourceReq struct {
-	Type       int32 `json:"type" validate:"required"`
-	Live       int32 `json:"live" validate:"required"`
-	Expire     int32 `json:"expire" validate:"required"`
-	Quota      int32 `json:"quota" validate:"required"`
-	DailyLimit int32 `json:"daily_limit" validate:"required"`
+	s.CreateResourceData
 }
 
 type CreateResourceResp struct {
@@ -170,7 +161,7 @@ type PaidCreateResourceReq struct {
 func PrepareResourceByAlipay(c *fiber.Ctx) error {
 
 	// 检查权限
-	authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
 	if err != nil {
 		return err
 	}
@@ -182,7 +173,7 @@ func PrepareResourceByAlipay(c *fiber.Ctx) error {
 	}
 
 	// 生成订单
-	amount, tradeNo, err := prepareResource(c.Context(), req)
+	tradeNo, err := s.ID.GenSerial(c.Context())
 	if err != nil {
 		return err
 	}
@@ -192,8 +183,8 @@ func PrepareResourceByAlipay(c *fiber.Ctx) error {
 		QRPayMode: "4",
 		Trade: alipay.Trade{
 			OutTradeNo:  tradeNo,
-			TotalAmount: strconv.FormatFloat(amount, 'f', 2, 64),
-			Subject:     "购买套餐",
+			TotalAmount: strconv.FormatFloat(req.GetPrice(), 'f', 2, 64),
+			Subject:     "购买套餐 - " + req.GetName(),
 			ProductCode: "FAST_INSTANT_TRADE_PAY",
 			TimeExpire:  time.Now().Add(30 * time.Minute).Format("2006-01-02 15:04:05"),
 		},
@@ -203,7 +194,7 @@ func PrepareResourceByAlipay(c *fiber.Ctx) error {
 	}
 
 	// 保存交易信息
-	err = savePrepareResource(c.Context(), req, amount, tradeNo, authContext.Payload.Id, 1)
+	err = s.Resource.PrepareResource(c.Context(), &req.CreateResourceData, authContext.Payload.Id, tradeNo, 1)
 
 	// 返回结果
 	return c.JSON(CreateResourceResp{
@@ -215,7 +206,7 @@ func PrepareResourceByAlipay(c *fiber.Ctx) error {
 func PrepareResourceByWechat(c *fiber.Ctx) error {
 
 	// 检查权限
-	authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	authContext, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
 	if err != nil {
 		return err
 	}
@@ -226,29 +217,27 @@ func PrepareResourceByWechat(c *fiber.Ctx) error {
 		return err
 	}
 
-	// 生成订单
-	amount, tradeNo, err := prepareResource(c.Context(), req)
+	// 生成订单号
+	tradeNo, err := s.ID.GenSerial(c.Context())
 	if err != nil {
 		return err
 	}
 
 	// 调用外部接口
-	alipayResp, err := g.Alipay.TradePagePay(alipay.TradePagePay{
-		QRPayMode: "3",
-		Trade: alipay.Trade{
-			OutTradeNo:  tradeNo,
-			TotalAmount: strconv.FormatFloat(amount, 'f', 2, 64),
-			Subject:     "购买套餐",
-			ProductCode: "FAST_INSTANT_TRADE_PAY",
-			TimeExpire:  time.Now().Add(30 * time.Minute).Format("2006-01-02 15:04:05"),
+	wechatPayResp, _, err := g.WechatPay.Native.Prepay(c.Context(), native.PrepayRequest{
+		Mchid:       &env.WechatPayMchId,
+		Appid:       &env.WechatPayAppId,
+		Description: u.P("购买套餐 - " + req.GetName()),
+		OutTradeNo:  &tradeNo,
+		TimeExpire:  u.P(time.Now().Add(30 * time.Minute)),
+		NotifyUrl:   &env.WechatPayCallbackUrl,
+		Amount: &native.Amount{
+			Total: u.P(int64(req.GetPrice() * 100)),
 		},
 	})
-	if err != nil {
-		return err
-	}
 
 	// 保存交易信息
-	err = savePrepareResource(c.Context(), req, amount, tradeNo, authContext.Payload.Id, 2)
+	err = s.Resource.PrepareResource(c.Context(), &req.CreateResourceData, authContext.Payload.Id, tradeNo, 2)
 	if err != nil {
 		return err
 	}
@@ -256,13 +245,13 @@ func PrepareResourceByWechat(c *fiber.Ctx) error {
 	// 返回结果
 	return c.JSON(CreateResourceResp{
 		TradeNo: tradeNo,
-		PayURL:  alipayResp.String(),
+		PayURL:  *wechatPayResp.CodeUrl,
 	})
 }
 
 func CreateResourceByAlipay(c *fiber.Ctx) error {
 	// 检查权限
-	authCtx, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	_, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
 	if err != nil {
 		return err
 	}
@@ -284,6 +273,7 @@ func CreateResourceByAlipay(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "支付未完成，请确认后重试")
 	}
 
+	// 创建套餐
 	payment, err := strconv.ParseFloat(alipayResp.ReceiptAmount, 64)
 	if err != nil {
 		return err
@@ -294,53 +284,7 @@ func CreateResourceByAlipay(c *fiber.Ctx) error {
 		return err
 	}
 
-	// 获取请求缓存
-	reqStr, err := rds.Client.GetDel(c.Context(), req.TradeNo).Result()
-	if err != nil {
-		return err
-	}
-
-	reqCreate := new(CreateResourceReq)
-	if err := json.Unmarshal([]byte(reqStr), reqCreate); err != nil {
-		return err
-	}
-
-	// 保存交易信息
-	err = q.Q.Transaction(func(q *q.Query) error {
-
-		// 保存套餐
-		resource, err := saveResourceBalance(reqCreate, authCtx.Payload.Id, 0)
-		if err != nil {
-			return err
-		}
-
-		// 更新订单状态
-		_, err = q.Trade.
-			Where(q.Trade.InnerNo).
-			Select(q.Trade.OuterNo, q.Trade.Payment, q.Trade.Status, q.Trade.PaidAt).
-			Updates(&m.Trade{
-				OuterNo: alipayResp.TradeNo,
-				Payment: payment,
-				Status:  1,
-				PaidAt:  common.LocalDateTime(paidAt),
-			})
-		if err != nil {
-			return err
-		}
-
-		// 更新账单状态
-		_, err = q.Bill.
-			Where(q.Bill.TradeID.Eq(resource.ID)).
-			Updates(&m.Bill{
-				ResourceID: resource.ID,
-				Status:     1,
-			})
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
+	err = s.Resource.CreateResourcePrepared(c.Context(), req.TradeNo, alipayResp.TradeNo, payment, paidAt)
 	if err != nil {
 		return err
 	}
@@ -350,63 +294,50 @@ func CreateResourceByAlipay(c *fiber.Ctx) error {
 
 func CreateResourceByWechat(c *fiber.Ctx) error {
 	// 检查权限
-	authCtx, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	_, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
 	if err != nil {
 		return err
 	}
 
 	// 解析请求参数
-	req := new(CreateResourceReq)
+	req := new(PaidCreateResourceReq)
 	if err := c.BodyParser(req); err != nil {
 		return err
 	}
 
-	err = q.Q.Transaction(func(q *q.Query) error {
-
-		// 保存套餐
-		resource, err := saveResourceBalance(req, authCtx.Payload.Id, 0)
-		if err != nil {
-			return err
-		}
-
-		// 更新订单状态
-		// _, err = q.Trade.
-		//     Where(q.Trade.InnerNo).
-		//     Select(q.Trade.OuterNo, q.Trade.Payment, q.Trade.Status, q.Trade.PaidAt).
-		//     Updates(&m.Trade{
-		//         OuterNo: alipayResp.TradeNo,
-		//         Payment: payment,
-		//         Status:  1,
-		//         PaidAt:  common.LocalDateTime(paidAt),
-		//     })
-		// if err != nil {
-		//     return err
-		// }
-
-		// 更新账单状态
-		_, err = q.Bill.
-			Where(q.Bill.TradeID.Eq(resource.ID)).
-			Updates(&m.Bill{
-				ResourceID: resource.ID,
-				Status:     1,
-			})
-		if err != nil {
-			return err
-		}
-
-		return nil
+	// 验证支付结果
+	wechatPayResp, _, err := g.WechatPay.Native.QueryOrderByOutTradeNo(c.Context(), native.QueryOrderByOutTradeNoRequest{
+		OutTradeNo: &req.TradeNo,
+		Mchid:      &env.WechatPayMchId,
 	})
 	if err != nil {
 		return err
 	}
 
+	if *wechatPayResp.TradeState != "SUCCESS" {
+		return fiber.NewError(fiber.StatusBadRequest, "支付未完成，请确认后重试")
+	}
+
+	// 创建套餐
+	payment := float64(*wechatPayResp.Amount.PayerTotal) / 100
+
+	paidAt, err := time.Parse(time.RFC3339, *wechatPayResp.SuccessTime)
+	if err != nil {
+		return err
+	}
+
+	err = s.Resource.CreateResourcePrepared(c.Context(), req.TradeNo, *wechatPayResp.OutTradeNo, payment, paidAt)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
 func CreateResourceByBalance(c *fiber.Ctx) error {
 
 	// 检查权限
-	authCtx, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	authCtx, err := auth.Protect(c, []s.PayloadType{s.PayloadUser}, []string{})
 	if err != nil {
 		return err
 	}
@@ -417,208 +348,13 @@ func CreateResourceByBalance(c *fiber.Ctx) error {
 		return err
 	}
 
-	// 计算价格
-	var amount = calcResourcePrice(req)
-
-	// 保存交易信息
-	err = q.Q.Transaction(func(q *q.Query) error {
-
-		// 保存套餐
-		resource, err := saveResourceBalance(req, authCtx.Payload.Id, amount)
-		if err != nil {
-			return err
-		}
-
-		// 生成账单
-		bill := m.Bill{
-			UserID:     authCtx.Payload.Id,
-			ResourceID: resource.ID,
-			BillNo:     services.ID.GenReadable("bil"),
-			Info:       "购买套餐 - " + resourceName(req),
-			Type:       1,
-			Status:     1,
-			Amount:     amount,
-		}
-		err = q.Bill.
-			Omit(q.Bill.TradeID, q.Bill.RefundID).
-			Create(&bill)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func calcResourcePrice(req *CreateResourceReq) float64 {
-	return 100
-}
-
-func prepareResource(ctx context.Context, req *CreateResourceReq) (amount float64, tradeNo string, err error) {
-
-	// todo 计算价格
-	amount = calcResourcePrice(req)
-
-	// 生成订单号
-	tradeNoUint, err := services.ID.GenSerial(ctx)
-	if err != nil {
-		return 0, "", err
-	}
-	tradeNo = strconv.FormatUint(tradeNoUint, 10)
-
-	return amount, tradeNo, nil
-}
-
-func savePrepareResource(ctx context.Context, req *CreateResourceReq, amount float64, tradeNo string, uid int32, method int32) error {
-	// 缓存交易信息
-	reqStr, err := json.Marshal(req)
-	if err != nil {
-		return err
-	}
-
-	err = rds.Client.Set(ctx, tradeNo, reqStr, 30*time.Minute).Err()
-	if err != nil {
-		return err
-	}
-
-	// 保存到数据库
-	err = q.Q.Transaction(func(q *q.Query) error {
-		// 创建交易订单
-		var trade = m.Trade{
-			UserID:  uid,
-			InnerNo: tradeNo,
-			Subject: "购买套餐 - " + resourceName(req),
-			Method:  method,
-			Type:    1,
-			Status:  0,
-			Amount:  amount,
-		}
-		err = q.Trade.Create(&trade)
-		if err != nil {
-			return err
-		}
-
-		// 保存用户帐单
-		bill := m.Bill{
-			UserID:  uid,
-			TradeID: trade.ID,
-			BillNo:  services.ID.GenReadable("bil"),
-			Info:    "购买产品",
-			Type:    1,
-			Status:  0,
-			Amount:  -amount,
-		}
-		err = q.Bill.
-			Omit(q.Bill.ResourceID, q.Bill.RefundID).
-			Create(&bill)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func saveResourceBalance(req *CreateResourceReq, uid int32, amount float64) (*m.Resource, error) {
-	// 检查用户
-	user, err := q.User.
-		Where(
-			q.User.ID.Eq(uid),
-			q.User.Status.Eq(1),
-		).
-		Take()
-	if err != nil {
-		return nil, err
-	}
-
-	// 检查余额
-	if user.Balance < amount {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "余额不足")
-	}
-
 	// 创建套餐
-	resource := &m.Resource{
-		UserID:     user.ID,
-		ResourceNo: services.ID.GenReadable("res"),
-		Active:     true,
-		Type:       1,
-		Pss: &m.ResourcePss{
-			Type:       req.Type,
-			Live:       req.Live,
-			Quota:      req.Quota,
-			Expire:     common.LocalDateTime(time.Now().Add(time.Duration(req.Expire) * time.Second)),
-			DailyLimit: req.DailyLimit,
-		},
-	}
-	err = q.Resource.Create(resource)
+	err = s.Resource.CreateResourceImmediately(&req.CreateResourceData, authCtx.Payload.Id)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	// 更新用户余额
-	user.Balance -= amount
-	_, err = q.User.
-		Where(q.User.ID.Eq(uid)).
-		Update(q.User.Balance, user.Balance)
-	if err != nil {
-		return nil, err
-	}
-
-	return resource, nil
-}
-
-func resourceName(req *CreateResourceReq) string {
-	sb := strings.Builder{}
-	sb.WriteString("短效动态")
-	switch req.Type {
-	case 1:
-		sb.WriteString("包时 ")
-	case 2:
-		sb.WriteString("包量 ")
-	}
-	sb.WriteString(fmt.Sprintf("%d 分钟", req.Live/60))
-	return sb.String()
-}
-
-// endregion
-
-// region CreateResourceByAlipayCallback
-
-type CreateResourceByAlipayCallbackReq struct {
-}
-
-// CreateResourceByAlipayCallback 支付宝支付回调
-func CreateResourceByAlipayCallback(c *fiber.Ctx) error {
-
-	// 根据支付类型执行不同流程：
-	// 1. 支付宝或微信（即时支付）
-	// - 更新订单状态
-	// - 生成账单
-	// - 生成套餐
-
-	return errors.New("not implemented")
-}
-
-// endregion
-
-// region CreateResourceByWechatCallback
-
-type CreateResourceByWechatCallbackReq struct {
-}
-
-// CreateResourceByWechatCallback 微信支付回调
-func CreateResourceByWechatCallback(c *fiber.Ctx) error {
-	return errors.New("not implemented")
+	return nil
 }
 
 // endregion

web/handlers/temp.go

@@ -1,22 +0,0 @@
-package handlers
-
-import (
-	q "platform/web/queries"
-	"time"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-func Temp(c *fiber.Ctx) error {
-
-	channels, err := q.Channel.Debug().Where(
-		q.Channel.Expiration.Lt(time.Now().Add(3 * time.Minute)),
-	).Find()
-	if err != nil {
-		return err
-	}
-
-	return c.JSON(fiber.Map{
-		"result": channels,
-	})
-}

web/handlers/trade.go

@@ -0,0 +1,117 @@
+package handlers
+
+import (
+	"net/http"
+	g "platform/web/globals"
+	s "platform/web/services"
+	"strconv"
+	"time"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/smartwalle/alipay/v3"
+)
+
+// region AlipayCallback
+
+func AlipayCallback(c *fiber.Ctx) error {
+
+	// 解析请求
+	req := make(map[string][]string)
+	c.Context().QueryArgs().VisitAll(func(key, value []byte) {
+		req[string(key)] = append(req[string(key)], string(value))
+	})
+	c.Context().PostArgs().VisitAll(func(key, value []byte) {
+		req[string(key)] = append(req[string(key)], string(value))
+	})
+
+	notification, err := g.Alipay.DecodeNotification(req)
+	if err != nil {
+		return err
+	}
+
+	switch notification.NotifyType {
+
+	// 支付成功
+	case string(alipay.TradeStatusSuccess):
+
+		if isRefund(notification) {
+			break
+		}
+
+		payment, err := strconv.ParseFloat(notification.TotalAmount, 64)
+		if err != nil {
+			return err
+		}
+
+		paidAt, err := time.Parse("2006-01-02 15:04:05", notification.GmtPayment)
+		if err != nil {
+			return err
+		}
+
+		err = s.Resource.CreateResourcePrepared(
+			c.Context(),
+			notification.OutTradeNo,
+			notification.TradeNo,
+			payment,
+			paidAt,
+		)
+		if err != nil {
+			return err
+		}
+
+	// 支付关闭
+	case string(alipay.TradeStatusClosed):
+
+		if isRefund(notification) {
+			break
+		}
+
+		cancelAt, err := time.Parse("2006-01-02 15:04:05", notification.GmtClose)
+		if err != nil {
+			return err
+		}
+
+		err = s.Resource.CancelResource(c.Context(), notification.OutTradeNo, cancelAt)
+		if err != nil {
+			return err
+		}
+
+	default:
+	}
+
+	g.Alipay.ACKNotification(AdapterWriter{
+		c: c,
+	})
+	return nil
+}
+
+type AdapterWriter struct {
+	c *fiber.Ctx
+}
+
+func (a AdapterWriter) Header() http.Header {
+	panic("implement me")
+}
+
+func (a AdapterWriter) Write(bytes []byte) (int, error) {
+	return a.c.Write(bytes)
+}
+
+func (a AdapterWriter) WriteHeader(statusCode int) {
+	a.c.Status(statusCode)
+}
+
+func isRefund(notification *alipay.Notification) bool {
+	return notification.OutBizNo != "" || notification.RefundFee != "" || notification.GmtRefund != ""
+}
+
+// endregion
+
+// region WechatPayCallback
+
+func WechatPayCallback(c *fiber.Ctx) error {
+
+	return nil
+}
+
+// endregion

web/models/bill.gen.go

@@ -25,7 +25,6 @@ type Bill struct {
 	Type       int32                `gorm:"column:type;not null" json:"type"`
 	BillNo     string               `gorm:"column:bill_no;not null" json:"bill_no"`
 	RefundID   int32                `gorm:"column:refund_id" json:"refund_id"`
-	Status     int32                `gorm:"column:status;not null" json:"status"`
 	Amount     float64              `gorm:"column:amount;not null" json:"amount"`
 	Trade      *Trade               `gorm:"foreignKey:TradeID" json:"trade"`
 	Refund     *Refund              `gorm:"foreignKey:RefundID" json:"refund"`

web/queries/bill.gen.go

@@ -38,7 +38,6 @@ func newBill(db *gorm.DB, opts ...gen.DOOption) bill {
 	_bill.Type = field.NewInt32(tableName, "type")
 	_bill.BillNo = field.NewString(tableName, "bill_no")
 	_bill.RefundID = field.NewInt32(tableName, "refund_id")
-	_bill.Status = field.NewInt32(tableName, "status")
 	_bill.Amount = field.NewFloat64(tableName, "amount")
 	_bill.Trade = billBelongsToTrade{
 		db: db.Session(&gorm.Session{}),
@@ -83,7 +82,6 @@ type bill struct {
 	Type       field.Int32
 	BillNo     field.String
 	RefundID   field.Int32
-	Status     field.Int32
 	Amount     field.Float64
 	Trade      billBelongsToTrade
 
@@ -117,7 +115,6 @@ func (b *bill) updateTableName(table string) *bill {
 	b.Type = field.NewInt32(table, "type")
 	b.BillNo = field.NewString(table, "bill_no")
 	b.RefundID = field.NewInt32(table, "refund_id")
-	b.Status = field.NewInt32(table, "status")
 	b.Amount = field.NewFloat64(table, "amount")
 
 	b.fillFieldMap()
@@ -135,7 +132,7 @@ func (b *bill) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }
 
 func (b *bill) fillFieldMap() {
-	b.fieldMap = make(map[string]field.Expr, 16)
+	b.fieldMap = make(map[string]field.Expr, 15)
 	b.fieldMap["id"] = b.ID
 	b.fieldMap["user_id"] = b.UserID
 	b.fieldMap["info"] = b.Info
@@ -147,7 +144,6 @@ func (b *bill) fillFieldMap() {
 	b.fieldMap["type"] = b.Type
 	b.fieldMap["bill_no"] = b.BillNo
 	b.fieldMap["refund_id"] = b.RefundID
-	b.fieldMap["status"] = b.Status
 	b.fieldMap["amount"] = b.Amount
 
 }

web/router.go

@@ -48,7 +48,7 @@ func ApplyRouters(app *fiber.App) {
 	bill := api.Group("/bill")
 	bill.Post("/list", handlers.ListBill)
 
-	// 临时
-	app.Get("/collect", handlers.CreateChannelGet)
-	app.Get("/temp", handlers.Temp)
+	// 交易
+	trade := api.Group("/trade")
+	trade.Post("/callback/alipay", handlers.AlipayCallback)
 }

web/services/id.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"platform/pkg/rds"
+	"strconv"
 	"strings"
 	"time"
 
@@ -42,7 +43,7 @@ var (
 	ErrSequenceOverflow = errors.New("sequence overflow")
 )
 
-func (s *IdService) GenSerial(ctx context.Context) (uint64, error) {
+func (s *IdService) GenSerial(ctx context.Context) (string, error) {
 	// 构造Redis键
 	now := time.Now().Unix()
 	key := idSerialKey(now)
@@ -74,13 +75,15 @@ func (s *IdService) GenSerial(ctx context.Context) (uint64, error) {
 		return err
 	}, key)
 	if err != nil {
-		return 0, err
+		return "", err
 	}
 
 	// 组装最终ID
 	id := uint64((now << timestampShift) | sequence)
 
-	return id, nil
+	idStr := strconv.FormatUint(id, 10)
+
+	return idStr, nil
 }
 
 // ParseSerial 解析ID，返回其组成部分

web/services/resource.go

@@ -0,0 +1,293 @@
+package services
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"platform/pkg/rds"
+	"platform/web/common"
+	m "platform/web/models"
+	q "platform/web/queries"
+	"strings"
+	"time"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+var Resource = &resourceService{}
+
+type resourceService struct{}
+
+func (s *resourceService) PrepareResource(ctx context.Context, data *CreateResourceData, uid int32, tradeNo string, method int32) error {
+	amount := data.GetPrice()
+
+	// 保存到数据库
+	err := q.Q.Transaction(func(q *q.Query) error {
+		// 创建交易订单
+		var trade = m.Trade{
+			UserID:  uid,
+			InnerNo: tradeNo,
+			Subject: "购买套餐 - " + data.GetName(),
+			Method:  method,
+			Type:    1,
+			Status:  0,
+			Amount:  amount,
+		}
+		err := q.Trade.Create(&trade)
+		if err != nil {
+			return err
+		}
+
+		// 保存用户帐单
+		bill := m.Bill{
+			UserID:  uid,
+			TradeID: trade.ID,
+			BillNo:  ID.GenReadable("bil"),
+			Info:    "购买套餐 - " + data.GetName(),
+			Type:    1,
+			Amount:  -amount,
+		}
+		err = q.Bill.
+			Omit(q.Bill.ResourceID, q.Bill.RefundID).
+			Create(&bill)
+		if err != nil {
+			return err
+		}
+
+		// 保存请求缓存
+		cache := &CreateResourceCache{
+			CreateResourceData: *data,
+			Uid:                uid,
+			TradeId:            trade.ID,
+			BillId:             bill.ID,
+		}
+
+		reqStr, err := json.Marshal(cache)
+		if err != nil {
+			return err
+		}
+
+		err = rds.Client.Set(ctx, tradeNo, reqStr, 30*time.Minute).Err()
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s *resourceService) CreateResourcePrepared(ctx context.Context, tradeNo string, outerTradeNo string, payment float64, at time.Time) error {
+
+	// 获取请求缓存
+	reqStr, err := rds.Client.Get(ctx, tradeNo).Result()
+	if err != nil {
+		return err
+	}
+
+	cache := new(CreateResourceCache)
+	if err := json.Unmarshal([]byte(reqStr), cache); err != nil {
+		return err
+	}
+
+	// 保存交易信息
+	err = q.Q.Transaction(func(q *q.Query) error {
+
+		// 保存套餐
+		resource, err := createResource(&cache.CreateResourceData, cache.Uid)
+		if err != nil {
+			return err
+		}
+
+		// 更新订单状态
+		_, err = q.Trade.Debug().
+			Select(q.Trade.OuterNo, q.Trade.Payment, q.Trade.Status, q.Trade.PaidAt).
+			Updates(&m.Trade{
+				ID:      cache.TradeId,
+				OuterNo: outerTradeNo,
+				Payment: payment,
+				Status:  1,
+				PaidAt:  common.LocalDateTime(at),
+			})
+		if err != nil {
+			return err
+		}
+
+		// 更新账单状态
+		_, err = q.Bill.Debug().
+			Select(q.Bill.ResourceID).
+			Updates(&m.Bill{
+				ID:         cache.BillId,
+				ResourceID: resource.ID,
+			})
+		if err != nil {
+			return err
+		}
+
+		// 删除缓存
+		err = rds.Client.Del(ctx, tradeNo).Err()
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s *resourceService) CreateResourceImmediately(data *CreateResourceData, uid int32) error {
+
+	// 保存交易信息
+	err := q.Q.Transaction(func(q *q.Query) error {
+
+		// 保存套餐
+		resource, err := createResource(data, uid)
+		if err != nil {
+			return err
+		}
+
+		// 生成账单
+		bill := m.Bill{
+			UserID:     uid,
+			ResourceID: resource.ID,
+			BillNo:     ID.GenReadable("bil"),
+			Info:       "购买套餐 - " + data.GetName(),
+			Type:       1,
+			Amount:     data.GetPrice(),
+		}
+		err = q.Bill.
+			Omit(q.Bill.TradeID, q.Bill.RefundID).
+			Create(&bill)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type CreateResourceData struct {
+	Type       int32 `json:"type" validate:"required"`
+	Live       int32 `json:"live" validate:"required"`
+	Expire     int32 `json:"expire" validate:"required"`
+	Quota      int32 `json:"quota" validate:"required"`
+	DailyLimit int32 `json:"daily_limit" validate:"required"`
+
+	name  string
+	price float64
+}
+
+func (data *CreateResourceData) GetName() string {
+	if data.name == "" {
+		sb := strings.Builder{}
+		sb.WriteString("短效动态")
+		switch data.Type {
+		case 1:
+			sb.WriteString("包时 ")
+		case 2:
+			sb.WriteString("包量 ")
+		}
+		sb.WriteString(fmt.Sprintf("%d 分钟", data.Live/60))
+		data.name = sb.String()
+	}
+	return data.name
+}
+
+func (data *CreateResourceData) GetPrice() float64 {
+	if data.price == 0 {
+		data.price = 0.01
+	}
+	return data.price
+}
+
+type CreateResourceCache struct {
+	CreateResourceData `json:"data"`
+	Uid                int32 `json:"uid"`
+	TradeId            int32 `json:"trade_id"`
+	BillId             int32 `json:"bill_id"`
+}
+
+func createResource(data *CreateResourceData, uid int32) (*m.Resource, error) {
+	amount := data.GetPrice()
+
+	// 检查用户
+	user, err := q.User.
+		Where(
+			q.User.ID.Eq(uid),
+			q.User.Status.Eq(1),
+		).
+		Take()
+	if err != nil {
+		return nil, err
+	}
+
+	// 检查余额
+	if user.Balance < amount {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "余额不足")
+	}
+
+	// 创建套餐
+	resource := &m.Resource{
+		UserID:     user.ID,
+		ResourceNo: ID.GenReadable("res"),
+		Active:     true,
+		Type:       1,
+		Pss: &m.ResourcePss{
+			Type:       data.Type,
+			Live:       data.Live,
+			Quota:      data.Quota,
+			Expire:     common.LocalDateTime(time.Now().Add(time.Duration(data.Expire) * time.Second)),
+			DailyLimit: data.DailyLimit,
+		},
+	}
+	err = q.Resource.Create(resource)
+	if err != nil {
+		return nil, err
+	}
+
+	// 更新用户余额
+	user.Balance -= amount
+	_, err = q.User.
+		Where(q.User.ID.Eq(uid)).
+		Update(q.User.Balance, user.Balance)
+	if err != nil {
+		return nil, err
+	}
+
+	return resource, nil
+}
+
+func (s *resourceService) CancelResource(ctx context.Context, tradeNo string, at time.Time) error {
+	// 获取请求缓存
+	_, err := rds.Client.Del(ctx, tradeNo).Result()
+	if err != nil {
+		return err
+	}
+
+	// 更新订单状态
+	_, err = q.Trade.
+		Where(q.Trade.InnerNo.Eq(tradeNo)).
+		Select(q.Trade.Status, q.Trade.CancelAt).
+		Updates(m.Trade{
+			Status:   2,
+			CancelAt: common.LocalDateTime(at),
+		})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

web/web.go

@@ -42,6 +42,7 @@ func (s *Server) Run() error {
 	// inits
 	g.InitBaiyin()
 	g.InitAlipay()
+	// g.InitWechatPay()
 
 	// config
 	s.fiber = fiber.New(fiber.Config{