From 28c9e44ef9c10e999792c38bed2c61819a13d808 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Tue, 13 Dec 2022 18:31:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=E9=85=8D=E9=80=81=E6=8F=92=E4=BB=B6=E7=BC=96=E7=A0=81=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Repositories/PluginRepo.php                |  2 ++
 .../Services/TotalServices/ShippingService.php   | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/beike/Repositories/PluginRepo.php b/beike/Repositories/PluginRepo.php
index de6bd959..d9ea2147 100644
--- a/beike/Repositories/PluginRepo.php
+++ b/beike/Repositories/PluginRepo.php
@@ -15,6 +15,7 @@ use Beike\Models\Plugin;
 use Beike\Plugin\Plugin as BPlugin;
 use Illuminate\Support\Facades\File;
 use Illuminate\Database\Eloquent\Collection;
+use Beike\Shop\Services\TotalServices\ShippingService;
 
 class PluginRepo
 {
@@ -180,6 +181,7 @@ class PluginRepo
      */
     public static function shippingEnabled($code): bool
     {
+        $code = ShippingService::parseShippingPluginCode($code);
         $shippingMethods = self::getShippingMethods();
         return $shippingMethods->where('code', $code)->count() > 0;
     }
diff --git a/beike/Shop/Services/TotalServices/ShippingService.php b/beike/Shop/Services/TotalServices/ShippingService.php
index 3347987e..a0b80d04 100644
--- a/beike/Shop/Services/TotalServices/ShippingService.php
+++ b/beike/Shop/Services/TotalServices/ShippingService.php
@@ -30,8 +30,7 @@ class ShippingService
             return null;
         }
 
-        $methodArray = explode('.', $shippingMethod);
-        $shippingPluginCode = $methodArray[0];
+        $shippingPluginCode = self::parseShippingPluginCode($shippingMethod);
         $pluginCode = Str::studly($shippingPluginCode);
 
         $plugin = app('plugin')->getPlugin($shippingPluginCode);
@@ -59,4 +58,17 @@ class ShippingService
 
         return $totalData;
     }
+
+
+    /**
+     * 通过配送方式获取插件编码
+     *
+     * @param $shippingMethod
+     * @return string
+     */
+    public static function parseShippingPluginCode($shippingMethod): string
+    {
+        $methodArray = explode('.', $shippingMethod);
+        return $methodArray[0];
+    }
 }