fiee/micro-bundle
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
蒋海成 2025-02-22 20:12:34 +08:00
parent 4a23bfb5fc
commit 53e1e1fea3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/dao/bundleDao.go
View File

@ -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, "获取套餐列表失败: ")
}

4
internal/dao/orderRecordsDao.go
View File

@ -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, "获取订单信息失败: ")