获取配置方式修改

app-hd/controllers/GhsController.php

@@ -322,7 +322,7 @@ class GhsController extends BaseController
         $ghsInfo['hcMap'] = $hcMap;
 
         //是否使用新的配送方式，关键词 sh_method_area
-        $newShMethod = dict::getDict('newShMethod');
+        $newShMethod = dict::getNewMethodShop();
         $ghsInfo['useNewShMethod'] = in_array($ghsShopId, $newShMethod) ? 1 : 0;
 
         util::success($ghsInfo);

app-hd/controllers/PurchaseController.php

@@ -633,7 +633,7 @@ class PurchaseController extends BaseController
             } else {
 
                 // xhShMethod 门店：下单前按配置写入不满最低消费时的附加包装费/运费，关键词 sh_method_area
-                $newShMethod = dict::getDict('newShMethod');
+                $newShMethod = dict::getNewMethodShop();
                 if (in_array($ghsShopId, $newShMethod)) {
                     $shMethodBigNum = 0;
                     foreach ($productList as $itemData) {
@@ -731,7 +731,7 @@ class PurchaseController extends BaseController
 
             $respond = PurchaseService::createPurchase($post, $ghsInfo);
 
-            $newShMethod = dict::getDict('newShMethod');
+            $newShMethod = dict::getNewMethodShop();
             if (in_array($ghsShopId, $newShMethod)) {
                 // 使用 xhShMethod 配置校验配送限制，替代旧版门店硬编码规则，关键词 sh_method_area
                 $shMethodError = ShMethodClass::checkLimit(

common/components/dict.php

@@ -8,8 +8,6 @@ class dict
 {
 
     public static $data = [
-		//使用新的配送方式
-        'newShMethod'=>[36843],
         // 配送方式默认配置
         'shMethod' => [
             0 => [
@@ -690,4 +688,14 @@ class dict
         return $respond;
     }
 
+    public static function getNewMethodShop()
+    {
+        $newShop = !getenv('NEW_METHOD_SHOP') ? '' : getenv('NEW_METHOD_SHOP');
+        if (empty($newShop)) {
+            return [];
+        }
+        $newShop = trim($newShop);
+        return explode(',', $newShop);
+    }
+
 }