From c9995ef56682dca3ea1ab76f0a6e98a337313e88 Mon Sep 17 00:00:00 2001
From: luorijun <luorijun@outlook.com>
Date: Tue, 24 Mar 2026 14:44:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/handlers/bill.go    | 7 ++++---
 web/handlers/channel.go | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

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"),
 		).