feat(order):增加审核状态筛选项;

nxhs-service/src/main/java/cc/yunxi/domain/query/DeliveryOrderQuery.java

@@ -20,4 +20,7 @@ public class DeliveryOrderQuery extends PageQuery<RecycleDeliveryOrder> {
     @ApiModelProperty(value = "手机号", example = "17802164218")
     @NotBlank(message = "手机号不能为空")
     private String phoneNumber;
+
+    @ApiModelProperty(value = "审核状态", example = "0")
+    private String adjustStatus;
 }

nxhs-service/src/main/java/cc/yunxi/domain/query/RecycleCleanOrderQuery.java

@@ -20,4 +20,7 @@ public class RecycleCleanOrderQuery extends PageQuery<RecycleCleanOrder> {
     @NotBlank(message = "手机号不能为空")
     private String phoneNumber;
 
+    @ApiModelProperty(value = "审核状态", example = "0")
+    private String adjustStatus;
+
 }

nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleCleanOrderServiceImpl.java

@@ -1,16 +1,13 @@
 package cc.yunxi.service.impl;
 
-import cc.yunxi.domain.converter.RecycleCleanOrderConvertMapper;
-import cc.yunxi.domain.converter.RecycleDeliveryOrderConvertMapper;
 import cc.yunxi.domain.po.RecycleCleanOrder;
-import cc.yunxi.domain.po.RecycleDeliveryOrder;
 import cc.yunxi.domain.query.RecycleCleanOrderQuery;
 import cc.yunxi.domain.vo.recycleorder.RecycleCleanOrderVO;
-import cc.yunxi.domain.vo.recycleorder.RecycleDeliveryOrderVO;
 import cc.yunxi.mapper.RecycleCleanOrderMapper;
 import cc.yunxi.service.IRecycleCleanOrderService;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.log4j.Log4j2;
@@ -24,6 +21,9 @@ public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderM
         log.info("查询清运订单号，phoneNumber：{}", cleanOrderQuery.getPhoneNumber());
         LambdaQueryWrapper<RecycleCleanOrder> wrapper = new LambdaQueryWrapper<>(RecycleCleanOrder.class)
                 .eq(RecycleCleanOrder::getPhone, cleanOrderQuery.getPhoneNumber());
+        if (StringUtils.isNotBlank(cleanOrderQuery.getAdjustStatus())) {
+            wrapper.eq(RecycleCleanOrder::getAdjustStatus, cleanOrderQuery.getAdjustStatus());
+        }
         Page<RecycleCleanOrder> pageDO = cleanOrderQuery.buildPage();
         return this.page(pageDO, wrapper);
     }

nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleDeliveryOrderServiceImpl.java

@@ -1,6 +1,5 @@
 package cc.yunxi.service.impl;
 
-import cc.yunxi.domain.converter.RecycleDeliveryOrderConvertMapper;
 import cc.yunxi.domain.po.RecycleDeliveryOrder;
 import cc.yunxi.domain.query.DeliveryOrderQuery;
 import cc.yunxi.domain.vo.recycleorder.RecycleDeliveryOrderVO;
@@ -8,6 +7,7 @@ import cc.yunxi.mapper.RecycleDeliveryOrderMapper;
 import cc.yunxi.service.IRecycleDeliveryOrderService;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.log4j.Log4j2;
@@ -22,6 +22,9 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
         log.info("查询投运订单号，phoneNumber：{}", deliveryOrderQuery.getPhoneNumber());
         LambdaQueryWrapper<RecycleDeliveryOrder> wrapper = new LambdaQueryWrapper<>(RecycleDeliveryOrder.class)
                 .eq(RecycleDeliveryOrder::getPhone, deliveryOrderQuery.getPhoneNumber());
+        if (StringUtils.isNotBlank(deliveryOrderQuery.getAdjustStatus())) {
+            wrapper.eq(RecycleDeliveryOrder::getAdjustStatus, deliveryOrderQuery.getAdjustStatus());
+        }
         Page<RecycleDeliveryOrder> pageDO = deliveryOrderQuery.buildPage();
         return this.page(pageDO, wrapper);
     }