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)