fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:调整订单列表

Browse Source
This commit is contained in:
momo 2023-11-13 17:08:50 +08:00
parent 9a82b28377
commit b45645edc3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
service/repositories/order.go
View File

@ -1282,7 +1282,8 @@ func (d *defaultOrder) List(ctx context.Context, in *ListReq) (res *ListRes, err
} }
} }
var count int64 var count int64
resultCount := model.Count(&count) var modelTotal = model
resultCount := modelTotal.Count(&count)
if resultCount.Error != nil { if resultCount.Error != nil {
logc.Errorf(ctx, "order count failed, err: %v", err) logc.Errorf(ctx, "order count failed, err: %v", err)
return nil, resultCount.Error 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) 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{ return &ListRes{
OrderDetailList: orderDetailList, OrderDetailList: orderDetailList,
Meta: map[string]int64{ Meta: map[string]int64{
"total_count": count, "total_count": count,
"page_count": count / in.PerPage, "page_count": pageCount,
"current_page": in.CurrentPage, "current_page": in.CurrentPage,
"per_page": in.PerPage, "per_page": in.PerPage,
}, },