From 63326cc5e0a019634e6f314cdcf275d2bcea77d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com>
Date: Sun, 17 Mar 2024 18:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/yunxi/service/impl/RecycleOrderServiceImpl.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
index 57a1704..42cfae3 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
@@ -78,7 +78,13 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
             }
         }
         wrapper.eq(StrUtil.isNotEmpty(recycleOrderQuery.getId()), RecycleOrder::getId, recycleOrderQuery.getId());
-        Page<RecycleOrder> pageDO = recycleOrderQuery.addOrderItem(RecycleOrder::getCreatorTime).buildPage();
+        // 默认按创建时间倒序、已完成则按结算时间倒序
+        if (OrderStatusEnum.FINISHED.equals(recycleOrderQuery.getStatus())) {
+            recycleOrderQuery.addOrderItem(RecycleOrder::getCompleteTime, false);
+        } else {
+            recycleOrderQuery.addOrderItem(RecycleOrder::getCreatorTime, false);
+        }
+        Page<RecycleOrder> pageDO = recycleOrderQuery.buildPage();
         return page(pageDO, wrapper);
     }