From 75e69d505ec6bef9bfcf2cace28313ae1b156453 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 7 Jul 2023 10:54:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E7=94=A8=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/order/StoreOrderRepository.php | 5 ++++-
 app/controller/api/server/StoreOrder.php                     | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 80afdf87..39ffef12 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -2554,11 +2554,14 @@ class StoreOrderRepository extends BaseRepository
      * @throws DbException
      * @throws ModelNotFoundException
      */
-    public function purchaseOrder($merId, $page, $limit)
+    public function purchaseOrder($merId, $keyword, $page, $limit)
     {
         $orders = StoreOrder::where('mer_id', $merId)
             ->where('pay_type', StoreGroupOrder::PAY_TYPE_CREDIT_BUY)
             ->where('status', StoreOrder::STATUS_WAIT_COMMENT)
+            ->when($keyword !== '', function ($query) use ($keyword) {
+                $query->where('order_sn|user_phone', 'like', "%$keyword%");
+            })
             ->page($page, $limit)
             ->select();
         foreach ($orders as $order) {
diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php
index d155edd9..94262309 100644
--- a/app/controller/api/server/StoreOrder.php
+++ b/app/controller/api/server/StoreOrder.php
@@ -383,7 +383,8 @@ class StoreOrder extends BaseController
     public function purchaseOrder($merId, StoreOrderRepository $orderRepository)
     {
         [$page, $limit] = $this->getPage();
-        $list = $orderRepository->purchaseOrder($merId, $page, $limit);
+        $keyword = $this->request->param('keyword');
+        $list = $orderRepository->purchaseOrder($merId, $keyword, $page, $limit);
         return app('json')->success($list);
     }