From 8921f9ca722662a460b5910bbb8fb43d0a5399fc Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Thu, 11 Jul 2024 14:07:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(device):=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=92=E5=BA=8F;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/yunxi/service/impl/RecycleCleanOrderServiceImpl.java   | 4 +++-
 .../yunxi/service/impl/RecycleDeliveryOrderServiceImpl.java   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleCleanOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleCleanOrderServiceImpl.java
index 254f240..382f2e8 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleCleanOrderServiceImpl.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleCleanOrderServiceImpl.java
@@ -17,10 +17,12 @@ import org.springframework.stereotype.Service;
 @Log4j2
 public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderMapper, RecycleCleanOrder> implements IRecycleCleanOrderService {
     @Override
+    @SuppressWarnings("unchecked")
     public Page<RecycleCleanOrder> queryOrderByPage(RecycleCleanOrderQuery cleanOrderQuery) {
         log.info("查询清运订单号，phoneNumber：{}", cleanOrderQuery.getPhoneNumber());
         LambdaQueryWrapper<RecycleCleanOrder> wrapper = new LambdaQueryWrapper<>(RecycleCleanOrder.class)
-                .eq(RecycleCleanOrder::getPhone, cleanOrderQuery.getPhoneNumber());
+                .eq(RecycleCleanOrder::getPhone, cleanOrderQuery.getPhoneNumber())
+                .orderByDesc(RecycleCleanOrder::getCreatorTime);
         if (StringUtils.isNotBlank(cleanOrderQuery.getAdjustStatus())) {
             wrapper.eq(RecycleCleanOrder::getAdjustStatus, cleanOrderQuery.getAdjustStatus());
         }
diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleDeliveryOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleDeliveryOrderServiceImpl.java
index c8f7985..350895e 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleDeliveryOrderServiceImpl.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleDeliveryOrderServiceImpl.java
@@ -26,10 +26,12 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
     private IClientService clientService;
 
     @Override
+    @SuppressWarnings("unchecked")
     public Page<RecycleDeliveryOrder> queryOrderByPage(DeliveryOrderQuery deliveryOrderQuery) {
         log.info("查询投运订单号，phoneNumber：{}", deliveryOrderQuery.getPhoneNumber());
         LambdaQueryWrapper<RecycleDeliveryOrder> wrapper = new LambdaQueryWrapper<>(RecycleDeliveryOrder.class)
-                .eq(RecycleDeliveryOrder::getPhone, deliveryOrderQuery.getPhoneNumber());
+                .eq(RecycleDeliveryOrder::getPhone, deliveryOrderQuery.getPhoneNumber())
+                .orderByDesc(RecycleDeliveryOrder::getCreatorTime);
         if (StringUtils.isNotBlank(deliveryOrderQuery.getAdjustStatus())) {
             wrapper.eq(RecycleDeliveryOrder::getAdjustStatus, deliveryOrderQuery.getAdjustStatus());
         }