From 76647e5b95b501aa533576fe78502db58706dddb Mon Sep 17 00:00:00 2001 From: dzq Date: Tue, 24 Jun 2025 15:45:36 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=9F=A5=E8=AF=A2):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=AE=A1=E6=89=B9=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=92=8C=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加handleStatus字段处理不同审批状态组合查询 添加searchStr字段支持订单名称和商品名称模糊搜索 --- .../query/SearchReturnApprovalQuery.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchReturnApprovalQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchReturnApprovalQuery.java index 5ce06e3..5306af7 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchReturnApprovalQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchReturnApprovalQuery.java @@ -32,11 +32,35 @@ public class SearchReturnApprovalQuery extends AbstractPageQuery { private Date endTime; private String paymentMethod; private Date approvalTime; + private Integer handleStatus; + private String searchStr; @Override public QueryWrapper addQueryCondition() { QueryWrapper queryWrapper = new QueryWrapper<>(); + if (status == null && handleStatus != null) { + if (handleStatus == 0) { + queryWrapper.and(wrapper -> + wrapper.eq("ra.status", 1) + .or() + .eq("ra.status", 4)); + } else if (handleStatus == 1) { + queryWrapper.and(wrapper -> + wrapper.eq("ra.status", 2) + .or() + .eq("ra.status", 3)); + } + } + + if (StrUtil.isNotEmpty(searchStr)) { + queryWrapper.and(wrapper -> + wrapper.like("so.name", searchStr) + .or() + .like("sog.goods_name", searchStr)); + } + + queryWrapper .eq(approvalId != null, "ra.approval_id", approvalId) .eq(orderId != null, "ra.order_id", orderId)