From cf1e787717dae3f64e5af5d4d2c9ac9d48247358 Mon Sep 17 00:00:00 2001
From: ztt <835303992@qq.com>
Date: Mon, 26 Feb 2024 23:01:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E4=BC=9A=E5=91=98=E5=92=8Cpl?=
 =?UTF-8?q?us=E4=BC=9A=E5=91=98=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/store/model/Order.php       | 7 +++++++
 app/store/model/OrderRefund.php | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/app/store/model/Order.php b/app/store/model/Order.php
index 0549d70e..e112180b 100644
--- a/app/store/model/Order.php
+++ b/app/store/model/Order.php
@@ -105,6 +105,13 @@ class Order extends OrderModel
          if(!UserService::isStore()) {
              $filter[] = ['user.user_id' ,'=', UserService::getCurrentLoginUserId() ];
          }
+         //普通会员和plus会员查询条件
+         if (!empty($param['user_id'])) {
+             $filter[] = ['user.user_id' ,'=', $param['user_id']];
+         }
+         if (!empty($param['delivery_type'])) {
+             $filter[] = ['order.delivery_type', '=', $param['delivery_type']];
+         }
         $filterOr = [];
         if (!empty($param['searchValue']) && $param['searchType'] == 'all') {
 //            $filterOr = [
diff --git a/app/store/model/OrderRefund.php b/app/store/model/OrderRefund.php
index 4a4aa5b5..d0f5d740 100644
--- a/app/store/model/OrderRefund.php
+++ b/app/store/model/OrderRefund.php
@@ -77,6 +77,13 @@ class OrderRefund extends OrderRefundModel
          if(!UserService::isStore()) {
              $filter[] = ['user.user_id' ,'=', UserService::getCurrentLoginUserId() ];
          }
+        //普通会员和plus会员查询条件
+        if (!empty($param['user_id'])) {
+            $filter[] = ['user.user_id' ,'=', $param['user_id']];
+        }
+        if (!empty($param['delivery_type'])) {
+            $filter[] = ['order.delivery_type', '=', $param['delivery_type']];
+        }
         $filterOr = [];
         if (!empty($param['searchValue']) && $param['searchType'] == 'all') {
 //            $filterOr = [