From ff5fe1e2cd73d71bae5a596fe23a0f3c87052a8f Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Thu, 6 Jul 2023 15:36:49 +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=A1=AE=E8=AE=A4?= 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 14d3d16d..e33a683f 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2515,14 +2515,14 @@ class StoreOrderRepository extends BaseRepository * @return void * @throws Exception */ - public function confirm($user, $id, $type) + public function confirm($id, $type) { /** @var StoreGroupOrderRepository $groupOrderRepository */ $groupOrderRepository = app()->make(StoreGroupOrderRepository::class); $groupOrderRepository->getAll = true; Db::startTrans(); try { - $groupOrder = $groupOrderRepository->detail($user['uid'], $id, false); + $groupOrder = $groupOrderRepository->get($id); if ($groupOrder->pay_type != StoreGroupOrder::PAY_TYPE_CREDIT_BUY) { throw new Exception('订单类型错误'); } diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php index 5401fe1d..89ab2aca 100644 --- a/app/controller/api/server/StoreOrder.php +++ b/app/controller/api/server/StoreOrder.php @@ -364,7 +364,7 @@ class StoreOrder extends BaseController $id = $this->request->param('id/d'); $type = $this->request->param('type/d'); try { - $repository->confirm($this->request->userInfo(), $id, $type); + $repository->confirm($id, $type); return app('json')->success('success'); } catch (\Exception $e) { return app('json')->fail($e->getMessage());