From 5f0768a4b5dca6c579a2c5ba41c843b76fb03a08 Mon Sep 17 00:00:00 2001 From: jiyufei <67400194@qq.com> Date: Wed, 26 Jun 2024 17:58:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=E5=A2=9E=E5=8A=A0=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89=E9=A1=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/yunxi/domain/query/DeliveryOrderQuery.java | 3 +++ .../cc/yunxi/domain/query/RecycleCleanOrderQuery.java | 3 +++ .../yunxi/service/impl/RecycleCleanOrderServiceImpl.java | 8 ++++---- .../service/impl/RecycleDeliveryOrderServiceImpl.java | 5 ++++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/query/DeliveryOrderQuery.java b/nxhs-service/src/main/java/cc/yunxi/domain/query/DeliveryOrderQuery.java index 3cc4cfc..5f40dbe 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/query/DeliveryOrderQuery.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/query/DeliveryOrderQuery.java @@ -20,4 +20,7 @@ public class DeliveryOrderQuery extends PageQuery { @ApiModelProperty(value = "手机号", example = "17802164218") @NotBlank(message = "手机号不能为空") private String phoneNumber; + + @ApiModelProperty(value = "审核状态", example = "0") + private String adjustStatus; } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/query/RecycleCleanOrderQuery.java b/nxhs-service/src/main/java/cc/yunxi/domain/query/RecycleCleanOrderQuery.java index 1d633c7..69b013b 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/query/RecycleCleanOrderQuery.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/query/RecycleCleanOrderQuery.java @@ -20,4 +20,7 @@ public class RecycleCleanOrderQuery extends PageQuery { @NotBlank(message = "手机号不能为空") private String phoneNumber; + @ApiModelProperty(value = "审核状态", example = "0") + private String adjustStatus; + } 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 b3805f0..dd9e393 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 @@ -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 wrapper = new LambdaQueryWrapper<>(RecycleCleanOrder.class) .eq(RecycleCleanOrder::getPhone, cleanOrderQuery.getPhoneNumber()); + if (StringUtils.isNotBlank(cleanOrderQuery.getAdjustStatus())) { + wrapper.eq(RecycleCleanOrder::getAdjustStatus, cleanOrderQuery.getAdjustStatus()); + } Page pageDO = cleanOrderQuery.buildPage(); return this.page(pageDO, wrapper); } 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 325e567..33a1f03 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 @@ -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 wrapper = new LambdaQueryWrapper<>(RecycleDeliveryOrder.class) .eq(RecycleDeliveryOrder::getPhone, deliveryOrderQuery.getPhoneNumber()); + if (StringUtils.isNotBlank(deliveryOrderQuery.getAdjustStatus())) { + wrapper.eq(RecycleDeliveryOrder::getAdjustStatus, deliveryOrderQuery.getAdjustStatus()); + } Page pageDO = deliveryOrderQuery.buildPage(); return this.page(pageDO, wrapper); }