From de166f62d1f8c4685a22ca432d4e5c73abeb86bc Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Sat, 21 Jun 2025 10:42:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=9F=A5=E8=AF=A2):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E7=8A=B6=E6=80=81=E5=92=8C=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BB=A5=E5=A2=9E=E5=BC=BA=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在SearchApiReturnApprovalQuery中添加handleStatus和searchStr字段，并实现相关查询逻辑：
1. 根据handleStatus筛选未处理(0)或已处理(1)的审批
2. 支持通过searchStr模糊匹配订单名称或商品名称
3. 保持原有查询条件不变的情况下扩展功能
---
 .../query/SearchApiReturnApprovalQuery.java   | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java
index 6f44c81..44e2b84 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java
@@ -16,6 +16,9 @@ public class SearchApiReturnApprovalQuery<T> extends AbstractPageQuery<T> {
     private Long goodsId;
     private String goodsName;
     private Integer status;
+    // 0:未处理 1:已处理
+    private Integer handleStatus;
+    private String searchStr;
     private Long externalGoodsId;
     private Long externalApprovalId;
     private String code;
@@ -36,6 +39,20 @@ public class SearchApiReturnApprovalQuery<T> extends AbstractPageQuery<T> {
     public QueryWrapper<T> addQueryCondition() {
         QueryWrapper<T> 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));
+            }
+        }
+
         queryWrapper
             .eq(approvalId != null, "ra.approval_id", approvalId)
             .eq(orderId != null, "ra.order_id", orderId)
@@ -51,8 +68,16 @@ public class SearchApiReturnApprovalQuery<T> extends AbstractPageQuery<T> {
             .eq(StrUtil.isNotEmpty(applyUserName), "ra.apply_user_name", applyUserName)
             .eq(StrUtil.isNotEmpty(auditUserid), "ra.audit_userid", auditUserid)
             .like(StrUtil.isNotEmpty(goodsName), "sog.goods_name", goodsName)
-            .between(startTime != null && endTime != null, "ra.create_time", startTime, endTime)
-            .orderByDesc("ra.approval_id");
+            .between(startTime != null && endTime != null, "ra.create_time", startTime, endTime);
+
+        if (StrUtil.isNotEmpty(searchStr)) {
+            queryWrapper.and(wrapper ->
+                    wrapper.like("so.name", searchStr)
+                            .or()
+                            .like("sog.goods_name", searchStr));
+        }
+
+        queryWrapper.orderByDesc("ra.approval_id");
 
         this.timeRangeColumn = "create_time";