diff --git a/beike/Repositories/PluginRepo.php b/beike/Repositories/PluginRepo.php index eebabe10..f1916412 100644 --- a/beike/Repositories/PluginRepo.php +++ b/beike/Repositories/PluginRepo.php @@ -92,27 +92,31 @@ class PluginRepo /** * 获取所有配送方式 */ - public static function getShippingMethods() + public static function getShippingMethods(): array { $allPlugins = self::allPlugins(); return $allPlugins->where('type', 'shipping')->filter(function ($item) { $plugin = (new Manager)->getPlugin($item->code); - $item->plugin = $plugin; + if ($plugin) { + $item->plugin = $plugin->toArray(); + } return $plugin && $plugin->getEnabled(); - }); + })->toArray(); } /** * 获取所有支付方式 */ - public static function getPaymentMethods() + public static function getPaymentMethods(): array { $allPlugins = self::allPlugins(); return $allPlugins->where('type', 'payment')->filter(function ($item) { $plugin = (new Manager)->getPlugin($item->code); - $item->plugin = $plugin; + if ($plugin) { + $item->plugin = $plugin->toArray(); + } return $plugin && $plugin->getEnabled(); - }); + })->toArray(); } }