From b45645edc34a0dd1474d7f9541b2ceaf2d2a8606 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Mon, 13 Nov 2023 17:08:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/repositories/order.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/service/repositories/order.go b/service/repositories/order.go index 39c5bce5..36602356 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -1282,7 +1282,8 @@ func (d *defaultOrder) List(ctx context.Context, in *ListReq) (res *ListRes, err } } var count int64 - resultCount := model.Count(&count) + var modelTotal = model + resultCount := modelTotal.Count(&count) if resultCount.Error != nil { logc.Errorf(ctx, "order count failed, err: %v", err) return nil, resultCount.Error @@ -1307,11 +1308,19 @@ func (d *defaultOrder) List(ctx context.Context, in *ListReq) (res *ListRes, err orderDetailList = make([]gmodel.OrderDetail, 0) } + var pageCount int64 = 1 + if count > in.PerPage { + var float64Count = float64(count) + var float64PerPage = float64(in.PerPage) + pageCountFloat := math.Ceil(float64Count / float64PerPage) + pageCount = int64(pageCountFloat) + } + return &ListRes{ OrderDetailList: orderDetailList, Meta: map[string]int64{ "total_count": count, - "page_count": count / in.PerPage, + "page_count": pageCount, "current_page": in.CurrentPage, "per_page": in.PerPage, },