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

修复提取并发问题 & 修复接口时区问题

Browse Source
This commit is contained in:
luorijun
2026-05-18 13:54:01 +08:00
parent 8f89503c88
commit 71554da541
16 changed files with 386 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/handlers/balance_activity.go
View File

@@ -102,7 +102,7 @@ func PageBalanceActivityByAdmin(c *fiber.Ctx) error {
}
// 查询余额变动列表
list, total, err := q.BalanceActivity.Debug().
list, total, err := q.BalanceActivity.
Joins(q.BalanceActivity.User, q.BalanceActivity.Admin, q.BalanceActivity.Bill).
Select(
q.BalanceActivity.ALL,

18
web/handlers/batch.go
View File

@@ -29,13 +29,20 @@ func PageBatch(ctx *fiber.Ctx) error {
// 查询批次
conds := q.LogsUserUsage.Where(q.LogsUserUsage.UserID.Eq(authCtx.User.ID))
if req.TimeStart != nil {
conds.Where(q.LogsUserUsage.Time.Gte(*req.TimeStart))
start := u.DateHead(*req.TimeStart)
conds.Where(q.LogsUserUsage.Time.Gte(start))
}
if req.TimeEnd != nil {
conds.Where(q.LogsUserUsage.Time.Lte(*req.TimeEnd))
end := u.DateTail(*req.TimeEnd)
conds.Where(q.LogsUserUsage.Time.Lte(end))
}
if req.ResourceNo != nil {
conds.Where(q.Resource.As("Resource").ResourceNo.Eq(*req.ResourceNo))
}
list, total, err := q.LogsUserUsage.Where(conds).
list, total, err := q.LogsUserUsage.Debug().
Joins(q.LogsUserUsage.Resource).
Where(conds).
Order(q.LogsUserUsage.Time.Desc()).
FindByPage(req.GetOffset(), req.GetLimit())
if err != nil {
@@ -53,8 +60,9 @@ func PageBatch(ctx *fiber.Ctx) error {
type PageResourceBatchReq struct {
c.PageReq
TimeStart *time.Time `json:"time_start"`
TimeEnd *time.Time `json:"time_end"`
ResourceNo *string `json:"resource_no"`
TimeStart *time.Time `json:"time_start"`
TimeEnd *time.Time `json:"time_end"`
}
// PageBatchByAdmin 分页查询所有提取记录

6
web/handlers/bill.go
View File

@@ -207,10 +207,12 @@ func ListBill(c *fiber.Ctx) error {
do.Where(q.Bill.Type.Eq(int(*req.Type)))
}
if req.CreateAfter != nil {
do.Where(q.Bill.CreatedAt.Gte(*req.CreateAfter))
start := u.DateHead(*req.CreateAfter)
do = do.Where(q.Bill.CreatedAt.Gte(start))
}
if req.CreateBefore != nil {
do.Where(q.Bill.CreatedAt.Lte(*req.CreateBefore))
end := u.DateTail(*req.CreateBefore)
do = do.Where(q.Bill.CreatedAt.Lte(end))
}
if req.BillNo != nil && *req.BillNo != "" {
do.Where(q.Bill.BillNo.Eq(*req.BillNo))

182
web/handlers/channel.go
View File

@@ -15,90 +15,6 @@ import (
"github.com/gofiber/fiber/v2"
)
// PageChannelByAdmin 分页查询所有通道
func PageChannelByAdmin(c *fiber.Ctx) error {
// 检查权限
_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeChannelRead)
if err != nil {
return err
}
// 解析请求参数
var req PageChannelsByAdminReq
if err := g.Validator.ParseBody(c, &req); err != nil {
return err
}
// 构建查询条件
do := q.Channel.Where()
if req.UserPhone != nil {
do = do.Where(q.User.As("User").Phone.Eq(*req.UserPhone))
}
if req.ResourceNo != nil {
do = do.Where(q.Resource.As("Resource").ResourceNo.Eq(*req.ResourceNo))
}
if req.BatchNo != nil {
do = do.Where(q.Channel.BatchNo.Eq(*req.BatchNo))
}
if req.ProxyHost != nil {
do = do.Where(q.Channel.Host.Eq(*req.ProxyHost))
}
if req.ProxyPort != nil {
do = do.Where(q.Channel.Port.Eq(*req.ProxyPort))
}
if req.NodeIP != nil {
ip, err := orm.ParseInet(*req.NodeIP)
if err != nil {
return core.NewBizErr("查询参数 ip 格式不正确")
}
do = do.Where(q.Channel.IP.Eq(ip))
}
if req.ExpiredAtStart != nil {
time := u.DateHead(*req.ExpiredAtStart)
do = do.Where(q.Channel.ExpiredAt.Gte(time))
}
if req.ExpiredAtEnd != nil {
time := u.DateHead(*req.ExpiredAtEnd)
do = do.Where(q.Channel.ExpiredAt.Lte(time))
}
// 查询通道列表
list, total, err := q.Channel.
Joins(q.Channel.User, q.Channel.Resource).
Select(
q.Channel.ALL,
q.Resource.As("Resource").ResourceNo.As("Resource__resource_no"),
q.User.As("User").Phone.As("User__phone"),
q.User.As("User").Name.As("User__name"),
).
Where(do).
Order(q.Channel.CreatedAt.Desc()).
FindByPage(req.GetOffset(), req.GetLimit())
if err != nil {
return err
}
// 返回结果
return c.JSON(core.PageResp{
List: list,
Total: int(total),
Page: req.GetPage(),
Size: req.GetSize(),
})
}
type PageChannelsByAdminReq struct {
core.PageReq
UserPhone *string `json:"user_phone"`
ResourceNo *string `json:"resource_no"`
BatchNo *string `json:"batch_no"`
ProxyHost *string `json:"proxy_host"`
ProxyPort *uint16 `json:"proxy_port"`
NodeIP *string `json:"node_ip" validator:"omitempty,ip"`
ExpiredAtStart *time.Time `json:"expired_at_start"`
ExpiredAtEnd *time.Time `json:"expired_at_end"`
}
// ListChannel 分页查询当前用户通道
func ListChannel(c *fiber.Ctx) error {
// 检查权限
@@ -126,10 +42,12 @@ func ListChannel(c *fiber.Ctx) error {
}
if req.ExpireAfter != nil {
cond.Where(q.Channel.ExpiredAt.Gte(*req.ExpireAfter))
start := u.DateHead(*req.ExpireAfter)
cond = cond.Where(q.Channel.ExpiredAt.Gte(start))
}
if req.ExpireBefore != nil {
cond.Where(q.Channel.ExpiredAt.Lte(*req.ExpireBefore))
end := u.DateTail(*req.ExpireBefore)
cond = cond.Where(q.Channel.ExpiredAt.Lte(end))
}
// 查询数据
@@ -269,6 +187,98 @@ type RemoveChannelsReq struct {
Batch string `json:"batch" validate:"required"`
}
// PageChannelByAdmin 分页查询所有通道
func PageChannelByAdmin(c *fiber.Ctx) error {
// 检查权限
_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeChannelRead)
if err != nil {
return err
}
// 解析请求参数
var req PageChannelsByAdminReq
if err := g.Validator.ParseBody(c, &req); err != nil {
return err
}
// 构建查询条件
do := q.Channel.Where()
if req.UserPhone != nil {
do = do.Where(q.User.As("User").Phone.Eq(*req.UserPhone))
}
if req.ResourceNo != nil {
do = do.Where(q.Resource.As("Resource").ResourceNo.Eq(*req.ResourceNo))
}
if req.BatchNo != nil {
do = do.Where(q.Channel.BatchNo.Eq(*req.BatchNo))
}
if req.ProxyHost != nil {
do = do.Where(q.Channel.Host.Eq(*req.ProxyHost))
}
if req.ProxyPort != nil {
do = do.Where(q.Channel.Port.Eq(*req.ProxyPort))
}
if req.NodeIP != nil {
ip, err := orm.ParseInet(*req.NodeIP)
if err != nil {
return core.NewBizErr("查询参数 ip 格式不正确")
}
do = do.Where(q.Channel.IP.Eq(ip))
}
if req.ExpiredAtStart != nil {
time := u.DateHead(*req.ExpiredAtStart)
do = do.Where(q.Channel.ExpiredAt.Gte(time))
}
if req.ExpiredAtEnd != nil {
time := u.DateHead(*req.ExpiredAtEnd)
do = do.Where(q.Channel.ExpiredAt.Lte(time))
}
if req.Expired != nil {
if *req.Expired {
do = do.Where(q.Channel.ExpiredAt.Lte(time.Now()))
} else {
do = do.Where(q.Channel.ExpiredAt.Gt(time.Now()))
}
}
// 查询通道列表
list, total, err := q.Channel.Debug().
Joins(q.Channel.User, q.Channel.Resource).
Select(
q.Channel.ALL,
q.Resource.As("Resource").ResourceNo.As("Resource__resource_no"),
q.User.As("User").Phone.As("User__phone"),
q.User.As("User").Name.As("User__name"),
).
Where(do).
Order(q.Channel.CreatedAt.Desc()).
FindByPage(req.GetOffset(), req.GetLimit())
if err != nil {
return err
}
// 返回结果
return c.JSON(core.PageResp{
List: list,
Total: int(total),
Page: req.GetPage(),
Size: req.GetSize(),
})
}
type PageChannelsByAdminReq struct {
core.PageReq
UserPhone *string `json:"user_phone"`
ResourceNo *string `json:"resource_no"`
BatchNo *string `json:"batch_no"`
ProxyHost *string `json:"proxy_host"`
ProxyPort *uint16 `json:"proxy_port"`
NodeIP *string `json:"node_ip" validator:"omitempty,ip"`
ExpiredAtStart *time.Time `json:"expired_at_start"`
ExpiredAtEnd *time.Time `json:"expired_at_end"`
Expired *bool `json:"expired"`
}
// PageChannelOfUserByAdmin 分页查询指定用户的通道
func PageChannelOfUserByAdmin(c *fiber.Ctx) error {
// 检查权限

18
web/handlers/coupon_user.go
View File

@@ -282,22 +282,28 @@ func couponUserPageConditions(req CouponUserPageFilter) []gen.Condition {
}
}
if req.CreatedAtStart != nil {
conds = append(conds, q.CouponUser.CreatedAt.Gte(u.DateHead(*req.CreatedAtStart)))
start := u.DateHead(*req.CreatedAtStart)
conds = append(conds, q.CouponUser.CreatedAt.Gte(start))
}
if req.CreatedAtEnd != nil {
conds = append(conds, q.CouponUser.CreatedAt.Lte(u.DateTail(*req.CreatedAtEnd)))
end := u.DateTail(*req.CreatedAtEnd)
conds = append(conds, q.CouponUser.CreatedAt.Lte(end))
}
if req.ExpireAtStart != nil {
conds = append(conds, q.CouponUser.ExpireAt.Gte(u.DateHead(*req.ExpireAtStart)))
start := u.DateHead(*req.ExpireAtStart)
conds = append(conds, q.CouponUser.ExpireAt.Gte(start))
}
if req.ExpireAtEnd != nil {
conds = append(conds, q.CouponUser.ExpireAt.Lte(u.DateTail(*req.ExpireAtEnd)))
end := u.DateTail(*req.ExpireAtEnd)
conds = append(conds, q.CouponUser.ExpireAt.Lte(end))
}
if req.UsedAtStart != nil {
conds = append(conds, q.CouponUser.UsedAt.Gte(u.DateHead(*req.UsedAtStart)))
start := u.DateHead(*req.UsedAtStart)
conds = append(conds, q.CouponUser.UsedAt.Gte(start))
}
if req.UsedAtEnd != nil {
conds = append(conds, q.CouponUser.UsedAt.Lte(u.DateTail(*req.UsedAtEnd)))
end := u.DateTail(*req.UsedAtEnd)
conds = append(conds, q.CouponUser.UsedAt.Lte(end))
}
return conds
}

40
web/handlers/resource.go
View File

@@ -44,16 +44,20 @@ func PageResourceShort(c *fiber.Ctx) error {
do.Where(q.ResourceShort.As(q.Resource.Short.Name()).Type.Eq(*req.Type))
}
if req.CreateAfter != nil {
do.Where(q.Resource.CreatedAt.Gte(*req.CreateAfter))
start := u.DateHead(*req.CreateAfter)
do = do.Where(q.Resource.CreatedAt.Gte(start))
}
if req.CreateBefore != nil {
do.Where(q.Resource.CreatedAt.Lte(*req.CreateBefore))
end := u.DateTail(*req.CreateBefore)
do = do.Where(q.Resource.CreatedAt.Lte(end))
}
if req.ExpireAfter != nil {
do.Where(q.ResourceShort.As(q.Resource.Short.Name()).ExpireAt.Gte(*req.ExpireAfter))
start := u.DateHead(*req.ExpireAfter)
do = do.Where(q.ResourceShort.As(q.Resource.Short.Name()).ExpireAt.Gte(start))
}
if req.ExpireBefore != nil {
do.Where(q.ResourceShort.As(q.Resource.Short.Name()).ExpireAt.Lte(*req.ExpireBefore))
end := u.DateTail(*req.ExpireBefore)
do = do.Where(q.ResourceShort.As(q.Resource.Short.Name()).ExpireAt.Lte(end))
}
if req.Status != nil {
var short = q.ResourceShort.As(q.Resource.Short.Name())
@@ -69,7 +73,7 @@ func PageResourceShort(c *fiber.Ctx) error {
}
}
resource, err := q.Resource.Where(do).
resource, err := q.Resource.Where(do).Debug().
Joins(q.Resource.Short).
Order(q.Resource.CreatedAt.Desc()).
Offset(req.GetOffset()).
@@ -141,16 +145,20 @@ func PageResourceLong(c *fiber.Ctx) error {
do.Where(q.ResourceLong.As(q.Resource.Long.Name()).Type.Eq(int(*req.Type)))
}
if req.CreateAfter != nil {
do.Where(q.Resource.CreatedAt.Gte(*req.CreateAfter))
start := u.DateHead(*req.CreateAfter)
do = do.Where(q.Resource.CreatedAt.Gte(start))
}
if req.CreateBefore != nil {
do.Where(q.Resource.CreatedAt.Lte(*req.CreateBefore))
end := u.DateTail(*req.CreateBefore)
do = do.Where(q.Resource.CreatedAt.Lte(end))
}
if req.ExpireAfter != nil {
do.Where(q.ResourceLong.As(q.Resource.Long.Name()).ExpireAt.Gte(*req.ExpireAfter))
start := u.DateHead(*req.ExpireAfter)
do = do.Where(q.ResourceLong.As(q.Resource.Long.Name()).ExpireAt.Gte(start))
}
if req.ExpireBefore != nil {
do.Where(q.ResourceLong.As(q.Resource.Long.Name()).ExpireAt.Lte(*req.ExpireBefore))
end := u.DateTail(*req.ExpireBefore)
do = do.Where(q.ResourceLong.As(q.Resource.Long.Name()).ExpireAt.Lte(end))
}
if req.Status != nil {
var long = q.ResourceLong.As(q.Resource.Long.Name())
@@ -166,7 +174,7 @@ func PageResourceLong(c *fiber.Ctx) error {
}
}
resource, err := q.Resource.Where(do).
resource, err := q.Resource.Where(do).Debug().
Joins(q.Resource.Long).
Order(q.Resource.CreatedAt.Desc()).
Offset(req.GetOffset()).
@@ -329,10 +337,12 @@ func PageResourceLongByAdmin(c *fiber.Ctx) error {
do = do.Where(q.ResourceLong.As("Long").Type.Eq(*req.Mode))
}
if req.CreatedAtStart != nil {
do = do.Where(q.Resource.CreatedAt.Gte(*req.CreatedAtStart))
start := u.DateHead(*req.CreatedAtStart)
do = do.Where(q.Resource.CreatedAt.Gte(start))
}
if req.CreatedAtEnd != nil {
do = do.Where(q.Resource.CreatedAt.Lte(*req.CreatedAtEnd))
end := u.DateTail(*req.CreatedAtEnd)
do = do.Where(q.Resource.CreatedAt.Lte(end))
}
if req.Expired != nil {
if *req.Expired {
@@ -755,10 +765,12 @@ func StatisticResourceUsage(c *fiber.Ctx) error {
)
if req.TimeAfter != nil {
do.Where(q.LogsUserUsage.Time.Gte(*req.TimeAfter))
start := u.DateHead(*req.TimeAfter)
do = do.Where(q.LogsUserUsage.Time.Gte(start))
}
if req.TimeBefore != nil {
do.Where(q.LogsUserUsage.Time.Lte(*req.TimeBefore))
end := u.DateTail(*req.TimeBefore)
do = do.Where(q.LogsUserUsage.Time.Lte(end))
}
var data = new(StatisticResourceUsageResp)

24
web/handlers/user.go
View File

@@ -2,12 +2,14 @@ package handlers
import (
"errors"
"platform/pkg/u"
"platform/web/auth"
"platform/web/core"
g "platform/web/globals"
m "platform/web/models"
q "platform/web/queries"
s "platform/web/services"
"time"
"github.com/gofiber/fiber/v2"
"github.com/shopspring/decimal"
@@ -65,9 +67,17 @@ func PageUserByAdmin(c *fiber.Ctx) error {
do = do.Where(q.User.AdminID.IsNull())
}
}
if req.CreatedAtStart != nil {
start := u.DateHead(*req.CreatedAtStart)
do = do.Where(q.User.CreatedAt.Gte(start))
}
if req.CreatedAtEnd != nil {
end := u.DateTail(*req.CreatedAtEnd)
do = do.Where(q.User.CreatedAt.Lte(end))
}
// 查询用户列表
users, total, err := q.User.
users, total, err := q.User.Debug().
Preload(q.User.Admin, q.User.Discount).
Omit(q.User.Password, q.Admin.Password).
Where(do).
@@ -102,11 +112,13 @@ func PageUserByAdmin(c *fiber.Ctx) error {
type PageUserByAdminReq struct {
core.PageReq
Account *string `json:"account,omitempty"`
Name *string `json:"name,omitempty"`
Identified *bool `json:"identified,omitempty"`
Enabled *bool `json:"enabled,omitempty"`
Assigned *bool `json:"assigned,omitempty"`
Account *string `json:"account,omitempty"`
Name *string `json:"name,omitempty"`
Identified *bool `json:"identified,omitempty"`
Enabled *bool `json:"enabled,omitempty"`
Assigned *bool `json:"assigned,omitempty"`
CreatedAtStart *time.Time `json:"created_at_start,omitempty"`
CreatedAtEnd *time.Time `json:"created_at_end,omitempty"`
}
// 管理员获取单个用户