diff --git a/web/handlers/bill.go b/web/handlers/bill.go index 3a0a7fc..6ba0cdb 100644 --- a/web/handlers/bill.go +++ b/web/handlers/bill.go @@ -28,13 +28,13 @@ func PageBillByAdmin(c *fiber.Ctx) error { // 构造查询条件 do := q.Bill.Where() if req.UserPhone != nil { - do = do.Where(q.User.Phone.Eq(*req.UserPhone)) + do = do.Where(q.User.As("User").Phone.Eq(*req.UserPhone)) } if req.TradeInnerNo != nil { - do = do.Where(q.Trade.InnerNo.Eq(*req.TradeInnerNo)) + do = do.Where(q.Trade.As("Trade").InnerNo.Eq(*req.TradeInnerNo)) } if req.ResourceNo != nil { - do = do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo)) + do = do.Where(q.Resource.As("Resource").ResourceNo.Eq(*req.ResourceNo)) } if req.BillNo != nil { do = do.Where(q.Bill.BillNo.Eq(*req.BillNo)) @@ -59,6 +59,7 @@ func PageBillByAdmin(c *fiber.Ctx) error { q.Resource.As("Resource").ResourceNo.As("Resource__resource_no"), ). Where(do). + Order(q.Bill.CreatedAt.Desc()). FindByPage(req.GetOffset(), req.GetLimit()) if err != nil { return err diff --git a/web/handlers/channel.go b/web/handlers/channel.go index 034b9f4..a5d0305 100644 --- a/web/handlers/channel.go +++ b/web/handlers/channel.go @@ -32,10 +32,10 @@ func PageChannelsByAdmin(c *fiber.Ctx) error { // 构建查询条件 do := q.Channel.Where() if req.UserPhone != nil { - do = do.Where(q.User.Phone.Eq(*req.UserPhone)) + do = do.Where(q.User.As("User").Phone.Eq(*req.UserPhone)) } if req.ResourceNo != nil { - do = do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo)) + do = do.Where(q.Resource.As("Resource").ResourceNo.Eq(*req.ResourceNo)) } if req.BatchNo != nil { do = do.Where(q.Channel.BatchNo.Eq(*req.BatchNo)) @@ -64,9 +64,10 @@ func PageChannelsByAdmin(c *fiber.Ctx) error { // 查询通道列表 list, total, err := q.Channel. - Joins(q.Channel.User). + 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"), ).