From f9380df2157484bba289172647ad80884e40ccf3 Mon Sep 17 00:00:00 2001
From: momo <1012651275@qq.com>
Date: Thu, 23 Nov 2023 16:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/repositories/order.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/service/repositories/order.go b/service/repositories/order.go
index c9c9e97a..31b935aa 100644
--- a/service/repositories/order.go
+++ b/service/repositories/order.go
@@ -1290,7 +1290,7 @@ func (d *defaultOrder) List(ctx context.Context, in *ListReq) (res *ListRes, err
 	}
 	var orderDetailList []gmodel.OrderDetail
 	if count > 0 {
-		m := model.Scopes(handlers.Paginate(&in.CurrentPage, &in.PerPage)).Order("id desc")
+		m := model.Scopes(handlers.Paginate(&in.CurrentPage, &in.PerPage)).Order("ctime desc,id desc")
 		result := m.Find(&orderList)
 		if result.Error != nil {
 			logc.Errorf(ctx, "order list failed, err: %v", err)
@@ -1310,10 +1310,7 @@ func (d *defaultOrder) List(ctx context.Context, in *ListReq) (res *ListRes, err
 
 	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)
+		pageCount = int64(math.Ceil(float64(count) / float64(in.PerPage)))
 	}
 
 	return &ListRes{