From 4c55b68f7e601be59b75694304dd82b1e63a6593 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Fri, 14 Jul 2023 15:04:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/store/order/StoreOrderRepository.php | 4 ++-- app/controller/api/server/StoreOrder.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 3c973f18..79b897ad 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2573,9 +2573,9 @@ class StoreOrderRepository extends BaseRepository * @throws DbException * @throws ModelNotFoundException */ - public function purchaseOrder($uid, $keyword, $page, $limit) + public function purchaseOrder($where, $keyword, $page, $limit) { - $orders = StoreOrder::where('uid', $uid) + $orders = StoreOrder::where($where) ->where('activity_type', 98) ->whereIn('status', [StoreOrder::STATUS_WAIT_COMMENT, StoreOrder::STATUS_FINISH]) ->where('is_del', 0) diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php index 416c95b4..dabbcbb0 100644 --- a/app/controller/api/server/StoreOrder.php +++ b/app/controller/api/server/StoreOrder.php @@ -388,7 +388,7 @@ class StoreOrder extends BaseController { [$page, $limit] = $this->getPage(); $keyword = $this->request->param('keyword'); - $list = $orderRepository->purchaseOrder($this->request->uid(), $keyword, $page, $limit); + $list = $orderRepository->purchaseOrder(['supplier_mer_id' => $merId], $keyword, $page, $limit); return app('json')->success($list); }