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 = [