From b80da7477448f601e9a42879ad3862483b19b7c3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 30 Dec 2020 14:24:46 +0800
Subject: [PATCH] Update ShopOrderSend.php

---
 app/data/controller/ShopOrderSend.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/data/controller/ShopOrderSend.php b/app/data/controller/ShopOrderSend.php
index e05d9708e..cb299a4f2 100644
--- a/app/data/controller/ShopOrderSend.php
+++ b/app/data/controller/ShopOrderSend.php
@@ -41,13 +41,13 @@ class ShopOrderSend extends Controller
         // 用户搜索查询
         $db = $this->_query('DataUser')->like('phone#member_phone,nickname#member_nickname')->db();
         if ($db->getOptions('where')) $query->whereRaw("uid in {$db->field('id')->buildSql()}");
+        // 订单搜索查询
+        $db = $this->_query('ShopOrder')->whereIn('status', [3, 4, 5])->db();
+        if ($db->getOptions('where')) $query->whereRaw("order_no in {$db->field('order_no')->buildSql()}");
         // 列表选项卡
         if (is_numeric($this->type = trim(input('type', 'ta'), 't'))) {
             $query->where(['status' => $this->type]);
         }
-        // 订单搜索查询
-        $db = $this->_query('ShopOrder')->whereIn('status', [3, 4, 5])->db();
-        $query->whereRaw("order_no in {$db->field('order_no')->buildSql()}");
         // 分页排序处理
         if (input('output') === 'json') {
             $result = $query->page(true, false);