From b1328b35ecdb2a685c9fdb0414bb22369d8f25db Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Tue, 24 Jun 2025 17:54:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=80=E8=B4=A7=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在订单查询条件中增加退货状态字段，根据不同的退货状态值查询对应的支付状态和商品状态
---
 .../domain/shop/order/query/SearchShopOrderQuery.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java
index c651859..7addcd7 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java
@@ -26,11 +26,21 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
     private Date payTime;
     private String paymentMethod;
     private String corpid;
+    private Integer returnStatus;
 
     @Override
     public QueryWrapper<T> addQueryCondition() {
         QueryWrapper<T> queryWrapper = new QueryWrapper<>();
 
+        if (returnStatus != null) {
+            if (returnStatus.equals(1)) {
+                queryWrapper.eq("o.pay_status", 2)
+                        .eq("og.status", 2);
+            } else {
+                queryWrapper.eq("o.pay_status", 2)
+                        .eq("og.status", 1);
+            }
+        }
         queryWrapper
             .eq(orderId != null, "o.order_id", orderId)
             .eq(cellId != null, "og.cell_id", cellId)