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

将 LocalDateTime 迁移到 orm

Browse Source
This commit is contained in:
luorijun
2025-05-10 15:00:03 +08:00
parent 3140d35a95
commit 37e6e58816
39 changed files with 414 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/handlers/bill.go
View File

@@ -1,6 +1,7 @@
package handlers
import (
"platform/pkg/orm"
"platform/web/auth"
"platform/web/core"
q "platform/web/queries"
@@ -41,10 +42,10 @@ func ListBill(c *fiber.Ctx) error {
do.Where(q.Bill.Type.Eq(int32(*req.Type)))
}
if req.CreateAfter != nil {
do.Where(q.Bill.CreatedAt.Gte(core.LocalDateTime(*req.CreateAfter)))
do.Where(q.Bill.CreatedAt.Gte(orm.LocalDateTime(*req.CreateAfter)))
}
if req.CreateBefore != nil {
do.Where(q.Bill.CreatedAt.Lte(core.LocalDateTime(*req.CreateBefore)))
do.Where(q.Bill.CreatedAt.Lte(orm.LocalDateTime(*req.CreateBefore)))
}
if req.BillNo != nil && *req.BillNo != "" {
do.Where(q.Bill.BillNo.Eq(*req.BillNo))

5
web/handlers/channel.go
View File

@@ -2,6 +2,7 @@ package handlers
import (
"fmt"
"platform/pkg/orm"
"platform/web/auth"
"platform/web/core"
channel2 "platform/web/domains/channel"
@@ -47,10 +48,10 @@ func ListChannels(c *fiber.Ctx) error {
}
if req.ExpireAfter != nil {
cond.Where(q.Channel.Expiration.Gte(core.LocalDateTime(*req.ExpireAfter)))
cond.Where(q.Channel.Expiration.Gte(orm.LocalDateTime(*req.ExpireAfter)))
}
if req.ExpireBefore != nil {
cond.Where(q.Channel.Expiration.Lte(core.LocalDateTime(*req.ExpireBefore)))
cond.Where(q.Channel.Expiration.Lte(orm.LocalDateTime(*req.ExpireBefore)))
}
// 查询数据

13
web/handlers/resource.go
View File

@@ -1,6 +1,7 @@
package handlers
import (
"platform/pkg/orm"
"platform/pkg/u"
"platform/web/auth"
"platform/web/core"
@@ -53,16 +54,16 @@ func ListResourcePss(c *fiber.Ctx) error {
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Type.Eq(int32(*req.Type)))
}
if req.CreateAfter != nil {
do.Where(q.Resource.CreatedAt.Gte(core.LocalDateTime(*req.CreateAfter)))
do.Where(q.Resource.CreatedAt.Gte(orm.LocalDateTime(*req.CreateAfter)))
}
if req.CreateBefore != nil {
do.Where(q.Resource.CreatedAt.Lte(core.LocalDateTime(*req.CreateBefore)))
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(core.LocalDateTime(*req.ExpireAfter)))
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Gte(orm.LocalDateTime(*req.ExpireAfter)))
}
if req.ExpireBefore != nil {
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Lte(core.LocalDateTime(*req.ExpireBefore)))
do.Where(q.ResourcePss.As(q.Resource.Pss.Name()).Expire.Lte(orm.LocalDateTime(*req.ExpireBefore)))
}
resource, err := q.Resource.Where(do).
@@ -118,13 +119,13 @@ func AllResource(c *fiber.Ctx) error {
q.Resource.Active.Is(true),
q.Resource.Where(
pss.Type.Eq(int32(resource2.PssTypeTime)),
pss.Expire.Gte(core.LocalDateTime(time.Now())),
pss.Expire.Gte(orm.LocalDateTime(time.Now())),
).Or(
pss.Type.Eq(int32(resource2.PssTypeCount)),
pss.Quota.GtCol(pss.Used),
),
q.Resource.Where(
pss.DailyLast.Lt(core.LocalDateTime(u.Today())),
pss.DailyLast.Lt(orm.LocalDateTime(u.Today())),
).Or(
pss.DailyUsed.LtCol(pss.DailyLimit),
),