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); }