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 pageDO = recycleOrderQuery.addOrderItem(RecycleOrder::getCreatorTime).buildPage(); + // 默认按创建时间倒序、已完成则按结算时间倒序 + if (OrderStatusEnum.FINISHED.equals(recycleOrderQuery.getStatus())) { + recycleOrderQuery.addOrderItem(RecycleOrder::getCompleteTime, false); + } else { + recycleOrderQuery.addOrderItem(RecycleOrder::getCreatorTime, false); + } + Page pageDO = recycleOrderQuery.buildPage(); return page(pageDO, wrapper); }