From 38ca0eae9ac7ee873202a192479f13245f6a03d3 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 12 Sep 2023 18:37:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=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

---
 app/common/dao/store/order/StoreOrderDao.php | 3 +++
 app/controller/api/server/StoreOrder.php     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/common/dao/store/order/StoreOrderDao.php b/app/common/dao/store/order/StoreOrderDao.php
index 0ff23ad2..c3178550 100644
--- a/app/common/dao/store/order/StoreOrderDao.php
+++ b/app/common/dao/store/order/StoreOrderDao.php
@@ -195,6 +195,9 @@ class StoreOrderDao extends BaseDao
                         ->whereOr('user_phone','like',"%{$where['search']}%");
                 });
             })
+            ->when(isset($where['order_search']) && $where['order_search'] !== '', function ($query) use ($where) {
+                $query->where('order_sn', 'like', '%' . $where['order_search'] . '%')->whereOr('user_phone', $where['order_search']);
+            })
             ->when(isset($where['group_order_sn']) && $where['group_order_sn'] !== '', function ($query) use ($where) {
                 $query->join('StoreGroupOrder GO','StoreOrder.group_order_id = GO.group_order_id')->where('group_order_sn',$where['group_order_sn']);
             })
diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php
index bcb876cc..2bd0992f 100644
--- a/app/controller/api/server/StoreOrder.php
+++ b/app/controller/api/server/StoreOrder.php
@@ -76,6 +76,7 @@ class StoreOrder extends BaseController
         }
         $where['is_verify'] = $this->request->param('is_verify');
         $where['search'] = $this->request->param('store_name');
+        $where['order_search'] = $this->request->param('search_info');
         $where['mer_id'] = $merId;
         $where['is_del'] = 0;
         return app('json')->success($repository->merchantGetList($where, $page, $limit));