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

修复翻页查询问题

Browse Source
This commit is contained in:
luorijun
2025-04-30 10:43:30 +08:00
parent f2ea7b152a
commit 64084f5303
5 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/handlers/bill.go
View File

@@ -39,19 +39,19 @@ func ListBill(c *fiber.Ctx) error {
Where(q.Bill.UserID.Eq(authContext.Payload.Id))
if req.Type != nil {
do = do.Where(q.Bill.Type.Eq(int32(*req.Type)))
do.Where(q.Bill.Type.Eq(int32(*req.Type)))
}
if req.CreateAfter != nil {
do = do.Where(q.Bill.CreatedAt.Gte(common.LocalDateTime(*req.CreateAfter)))
do.Where(q.Bill.CreatedAt.Gte(common.LocalDateTime(*req.CreateAfter)))
}
if req.CreateBefore != nil {
do = do.Where(q.Bill.CreatedAt.Lte(common.LocalDateTime(*req.CreateBefore)))
do.Where(q.Bill.CreatedAt.Lte(common.LocalDateTime(*req.CreateBefore)))
}
if req.BillNo != nil && *req.BillNo != "" {
do = do.Where(q.Bill.BillNo.Eq(*req.BillNo))
do.Where(q.Bill.BillNo.Eq(*req.BillNo))
}
bills, err := do.
bills, err := q.Bill.Where(do).
Preload(q.Bill.Resource, q.Bill.Trade, q.Bill.Refund).
Preload(q.Bill.Resource.Pss).
Order(q.Bill.CreatedAt.Desc()).
@@ -66,7 +66,7 @@ func ListBill(c *fiber.Ctx) error {
if len(bills) < req.GetLimit() {
total = int64(len(bills) + req.GetOffset())
} else {
total, err = do.Count()
total, err = q.Bill.Where(do).Count()
if err != nil {
return err
}