查询运费可以不用沙箱

app-ghs/controllers/IntraCityController.php

@@ -356,8 +356,7 @@ class IntraCityController extends BaseController
         if (empty($address)) {
             util::fail('客户地址缺失');
         }
-        //根据环境变量判断是否使用沙盒环境
-        $useSandBox = getenv('YII_ENV') == 'production' ? 0 : 1;
+        //查询运费可以不用沙箱
         $orderData = [
             'wx_store_id' => $wxStoreId,
             'user_name' => $customName,
@@ -366,7 +365,7 @@ class IntraCityController extends BaseController
             'user_lat' => $originalLat,
             'user_address' => $address,
             'cargo' => $cargo,
-            'use_sandbox' => $useSandBox,
+            'use_sandbox' => 0,
         ];
         //多处有用到这个方法，需修改请同步修改，搜索关键词 intra_city_express_pre_add
         $result = IntraCityExpress::preAddOrder($orderData);

app-hd/controllers/IntraCityController.php

@@ -290,7 +290,7 @@ class IntraCityController extends BaseController
         ];
         $originalLng = doubleval($post['user_lng']);
         $originalLat = doubleval($post['user_lat']);
-        $useSandBox = getenv('YII_ENV') == 'production' ? 0 : 1;// 根据环境变量判断是否使用沙盒环境
+        //查询运费，可以不用沙箱
         $orderData = [
             //'out_store_id' => $shopId,
             'wx_store_id' => $wxStoreId,
@@ -300,7 +300,7 @@ class IntraCityController extends BaseController
             'user_lat' => $originalLat,
             'user_address' => $post['user_address'],
             'cargo' => $cargo,
-            'use_sandbox' => $useSandBox,
+            'use_sandbox' => 0,
         ];
         //多处有用到这个方法，需修改请同步修改，搜索关键词 intra_city_express_pre_add
         $result = IntraCityExpress::preAddOrder($orderData);

common/components/IntraCityExpress.php

@@ -344,15 +344,6 @@ class IntraCityExpress
 
         $accessToken = self::getAccessToken($merchant, $ptStyle);
 
-        //开发环境只能使用沙箱 ssh
-        if (getenv('YII_ENV') != 'production') {
-            $orderData['use_sandbox'] = 1;
-            $orderData['user_name'] = '顺丰同城';
-            $orderData['user_phone'] = (string)13881979410;
-            $orderData['user_address'] = '北京市海淀区学清嘉创大厦A座15层';
-            $orderData['user_lng'] = (double)116.352954;
-            $orderData['user_lat'] = (double)40.014747;
-        }
         // 请求体
         $data = $orderData;