Merge remote-tracking branch 'origin/master'

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());
         }

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());
         }