lanhu/platform
2
0
Fork 0
Code Issues Actions Packages Releases 13 Activity

重命名资源套餐相关结构体和数据库表，新增长效套餐类型

Browse Source
This commit is contained in:
luorijun
2025-05-17 15:54:42 +08:00
parent 9043dd779b
commit d9613a19fb
22 changed files with 859 additions and 1196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/handlers/bill.go
View File

@@ -53,7 +53,7 @@ func ListBill(c *fiber.Ctx) error {
bills, err := q.Bill.Where(do).
Preload(q.Bill.Resource, q.Bill.Trade, q.Bill.Refund).
Preload(q.Bill.Resource.Pss).
Preload(q.Bill.Resource.Short).
Order(q.Bill.CreatedAt.Desc()).
Offset(req.GetOffset()).
Limit(req.GetLimit()).

4
web/handlers/edge.go
View File

@@ -36,9 +36,9 @@ func OnlineEdge(c *fiber.Ctx) (err error) {
// 挑选合适的转发服务
var fwd *m.Proxy
fwd, err = q.Proxy.Debug().
fwd, err = q.Proxy.
LeftJoin(q.Edge, q.Edge.ProxyID.EqCol(q.Proxy.ID), q.Edge.Status.Eq(1)).
Select(q.Proxy.ALL, q.Edge.ALL.Count().As("count")).
LeftJoin(q.Edge, q.Edge.ProxyID.EqCol(q.Proxy.ID)).
Where(q.Proxy.Type.Eq(int32(proxy2.TypeSelfHosted))).
Group(q.Proxy.ID).
Order(field.NewField("", "count").Desc()).

34
web/handlers/resource.go
View File

@@ -14,9 +14,9 @@ import (
"github.com/gofiber/fiber/v2"
)
// region ListResourcePss
// region ListResourceShort
type ListResourcePssReq struct {
type ListResourceShortReq struct {
core.PageReq
ResourceNo *string `json:"resource_no"`
Active *bool `json:"active"`
@@ -27,8 +27,8 @@ type ListResourcePssReq struct {
ExpireBefore *time.Time `json:"expire_before"`
}
// ListResourcePss 获取套餐列表
func ListResourcePss(c *fiber.Ctx) error {
// ListResourceShort 获取套餐列表
func ListResourceShort(c *fiber.Ctx) error {
// 检查权限
authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
if err != nil {
@@ -36,7 +36,7 @@ func ListResourcePss(c *fiber.Ctx) error {
}
// 解析请求参数
req := new(ListResourcePssReq)
req := new(ListResourceShortReq)
if err := c.BodyParser(req); err != nil {
return err
}
@@ -51,7 +51,7 @@ func ListResourcePss(c *fiber.Ctx) error {
do.Where(q.Resource.Active.Is(*req.Active))
}
if req.Type != nil {
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Type.Eq(int32(*req.Type)))
do.Where(q.ResourceShort.As(q.Resource.Short.Name()).Type.Eq(int32(*req.Type)))
}
if req.CreateAfter != nil {
do.Where(q.Resource.CreatedAt.Gte(orm.LocalDateTime(*req.CreateAfter)))
@@ -60,14 +60,14 @@ func ListResourcePss(c *fiber.Ctx) error {
do.Where(q.Resource.CreatedAt.Lte(orm.LocalDateTime(*req.CreateBefore)))
}
if req.ExpireAfter != nil {
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Gte(orm.LocalDateTime(*req.ExpireAfter)))
do.Where(q.ResourceShort.As(q.Resource.Short.Name()).Expire.Gte(orm.LocalDateTime(*req.ExpireAfter)))
}
if req.ExpireBefore != nil {
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Lte(orm.LocalDateTime(*req.ExpireBefore)))
do.Where(q.ResourceShort.As(q.Resource.Short.Name()).Expire.Lte(orm.LocalDateTime(*req.ExpireBefore)))
}
resource, err := q.Resource.Where(do).
Joins(q.Resource.Pss).
Joins(q.Resource.Short).
Order(q.Resource.CreatedAt.Desc()).
Offset(req.GetOffset()).
Limit(req.GetLimit()).
@@ -111,23 +111,23 @@ func AllResource(c *fiber.Ctx) error {
}
// 查询套餐列表
pss := q.ResourcePss.As(q.Resource.Pss.Name())
short := q.ResourceShort.As(q.Resource.Short.Name())
do := q.Resource.
Joins(q.Resource.Pss).
Joins(q.Resource.Short).
Where(
q.Resource.UserID.Eq(authContext.Payload.Id),
q.Resource.Active.Is(true),
q.Resource.Where(
pss.Type.Eq(int32(resource2.PssTypeTime)),
pss.Expire.Gte(orm.LocalDateTime(time.Now())),
short.Type.Eq(int32(resource2.ModeTime)),
short.Expire.Gte(orm.LocalDateTime(time.Now())),
).Or(
pss.Type.Eq(int32(resource2.PssTypeCount)),
pss.Quota.GtCol(pss.Used),
short.Type.Eq(int32(resource2.ModeCount)),
short.Quota.GtCol(short.Used),
),
q.Resource.Where(
pss.DailyLast.Lt(orm.LocalDateTime(u.Today())),
short.DailyLast.Lt(orm.LocalDateTime(u.Today())),
).Or(
pss.DailyUsed.LtCol(pss.DailyLimit),
short.DailyUsed.LtCol(short.DailyLimit),
),
)