diff --git a/addons/shopro/library/split/SplitExecutor.php b/addons/shopro/library/split/SplitExecutor.php index 302b210..741c95b 100644 --- a/addons/shopro/library/split/SplitExecutor.php +++ b/addons/shopro/library/split/SplitExecutor.php @@ -127,7 +127,7 @@ class SplitExecutor public function retry($splitOrderId) { - $splitOrder = SplitOrder::with('receivers')->get($splitOrderId); + $splitOrder = SplitOrder::get($splitOrderId, ['receivers']); if (!$splitOrder) { return false; } diff --git a/addons/shopro_huifu/library/HuifuSplitService.php b/addons/shopro_huifu/library/HuifuSplitService.php index c4e800b..b9bb28a 100644 --- a/addons/shopro_huifu/library/HuifuSplitService.php +++ b/addons/shopro_huifu/library/HuifuSplitService.php @@ -101,7 +101,7 @@ class HuifuSplitService public function retry($splitOrderId) { - $splitOrder = SplitOrder::with('receivers')->get($splitOrderId); + $splitOrder = SplitOrder::where('id', $splitOrderId)->find(); if (!$splitOrder || $splitOrder['channel'] !== 'huifu') { return false; } diff --git a/application/admin/controller/shopro/business_school/Settlement.php b/application/admin/controller/shopro/business_school/Settlement.php index 952291d..23e0287 100644 --- a/application/admin/controller/shopro/business_school/Settlement.php +++ b/application/admin/controller/shopro/business_school/Settlement.php @@ -101,7 +101,7 @@ class Settlement extends Base public function edit($ids = null) { - $row = $this->model->with('items')->get($ids); + $row = $this->model->get($ids, ['items']); if (!$row) { $this->error('记录不存在'); } diff --git a/application/admin/controller/shopro/operating_company/Settlement.php b/application/admin/controller/shopro/operating_company/Settlement.php index ea8b43e..130c53e 100644 --- a/application/admin/controller/shopro/operating_company/Settlement.php +++ b/application/admin/controller/shopro/operating_company/Settlement.php @@ -101,7 +101,7 @@ class Settlement extends Base public function edit($ids = null) { - $row = $this->model->with('items')->get($ids); + $row = $this->model->get($ids, ['items']); if (!$row) { $this->error('记录不存在'); }