From 53e1e1fea300821f9e46548839dec3b0238a299d Mon Sep 17 00:00:00 2001 From: jhc Date: Sat, 22 Feb 2025 20:12:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleDao.go | 6 +++++- internal/dao/orderRecordsDao.go | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/dao/bundleDao.go b/internal/dao/bundleDao.go index 53f6586..1f4ed6b 100644 --- a/internal/dao/bundleDao.go +++ b/internal/dao/bundleDao.go @@ -63,7 +63,11 @@ func BundleList(req *bundle.BundleListRequest) (res *bundle.BundleListResponse, count := *query - if err = query.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize)).Find(&bundles).Error; err != nil { + if req.PageSize != 0 && req.Page != 0 { + query = query.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize)) + } + + if err = query.Find(&bundles).Error; err != nil { return res, commonErr.ReturnError(err, msg.ErrorGetBundleList, "获取套餐列表失败: ") } diff --git a/internal/dao/orderRecordsDao.go b/internal/dao/orderRecordsDao.go index c9d0330..2f4f42b 100644 --- a/internal/dao/orderRecordsDao.go +++ b/internal/dao/orderRecordsDao.go @@ -96,12 +96,12 @@ func OrderRecordsList(req *bundle.OrderRecordsRequest) (res *bundle.OrderRecords query = query.Where("pay_time <= ?", req.EndPayTime) } + count := *query + if req.PageSize != 0 && req.Page != 0 { query = query.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize)) } - count := *query - err = query.Find(&records).Error if err != nil { return res, commonErr.ReturnError(err, msg.ErrorGetOrderList, "获取订单信息失败: ")