Merge branch 'master' of git.huaml.com:zhh/huahuibao

app-hd/controllers/IntraCityController.php

@@ -27,6 +27,7 @@ use biz\wx\classes\WxMessageClass;
 class IntraCityController extends BaseController
 {
     public $guestAccess = ['callback'];
+    public $useSandbox = true;//是否开启沙箱
 
     /**
      * 创建门店
@@ -445,6 +446,19 @@ class IntraCityController extends BaseController
                 //'use_sandbox' => getenv('YII_ENV') == 'production' ? 0 : 1, // 是否使用沙箱(非必传)
                 'cargo' => $cargo
             ];
+
+            //开发环境允许使用沙箱 ssh
+            if (getenv('YII_ENV') != 'production') {
+                if ($this->useSandbox) {
+                    $orderData['use_sandbox'] = 1;
+                    $orderData['user_name'] = '顺丰同城';
+                    $orderData['user_phone'] = 13881979410;
+                    $orderData['user_address'] = '北京市海淀区学清嘉创大厦A座15层';
+                    $orderData['user_lng'] = '116.352954';
+                    $orderData['user_lat'] = '40.014747';
+                }
+            }
+
             $result = IntraCityExpress::createOrder($orderData);
 
             if (isset($result['errcode']) && $result['errcode'] === 0) {
@@ -454,15 +468,15 @@ class IntraCityController extends BaseController
                 $orderData = [
                     'mainId' => $this->mainId,
                     'shopId' => $this->shopId,
-                    'deliveryId' => isset($result['service_trans_id']) ? $result['service_trans_id'] : '',
-                    'wxOrderId' => isset($result['wx_order_id']) ? $result['wx_order_id'] : '',
-                    'wxStoreId' => isset($result['wx_store_id']) ? $result['wx_store_id'] : '',
-                    'storeOrderId' => isset($result['store_order_id']) ? $result['store_order_id'] : '',
-                    'transOrderId' => isset($result['trans_order_id']) ? $result['trans_order_id'] : '',
-                    'distance' => isset($result['distance']) ? $result['distance'] : 0,
-                    'fee' => isset($result['fee']) ? $result['fee'] : 0,
-                    'fetchCode' => isset($result['fetch_code']) ? $result['fetch_code'] : '',
-                    'orderSeq' => isset($result['order_seq']) ? $result['order_seq'] : ''
+                    'deliveryId' => $result['service_trans_id'] ?? '',
+                    'wxOrderId' => $result['wx_order_id'] ?? '',
+                    'wxStoreId' => $result['wx_store_id'] ?? '',
+                    'storeOrderId' => $result['store_order_id'] ?? '',
+                    'transOrderId' => $result['trans_order_id'] ?? '',
+                    'distance' => $result['distance'] ?? 0,
+                    'fee' => $result['fee'] ?? 0,
+                    'fetchCode' => $result['fetch_code'] ?? '',
+                    'orderSeq' => $result['order_seq'] ?? ''
                 ];
                 ExpressOrderClass::add($orderData);