Merge branch 'hcy_pcb_20181221-r' into development

1aea138c · PRY5YKGJ82EZEPX\Administrator · 2612c41c · 7bd74c20 · 1aea138c
Commit 1aea138c authored Dec 26, 2018 by $PRY5YKGJ82EZEPX\Administrator's avatar$ PRY5YKGJ82EZEPX\Administrator
Showing with 6 additions and 4 deletions
app/Http/Controllers/WebController.php
--- a/app/Http/Controllers/WebController.php
+++ b/app/Http/Controllers/WebController.php
@@ -133,10 +133,12 @@ class WebController extends Controller
        $orderBase['company_name'] = $userCompany ? $userCompany->com_name : "" ;
        //拼接收货信息
        $RegionController = new RegionController();
-        $orderAddress =  objectToArray($orderAddress);
-        $orderAddress['province'] = $RegionController->getRegionName($orderAddress['province']);
-        $orderAddress['city'] = $RegionController->getRegionName($orderAddress['city']);
-        $orderAddress['district'] = $RegionController->getRegionName($orderAddress['district']);
+        if ($orderAddress){
+            $orderAddress =  objectToArray($orderAddress);
+            $orderAddress['province'] = $RegionController->getRegionName($orderAddress['province']);
+            $orderAddress['city'] = $RegionController->getRegionName($orderAddress['city']);
+            $orderAddress['district'] = $RegionController->getRegionName($orderAddress['district']);
+        }
        //拼接发票信息
        if ($orderInvoice){
            $orderInvoice =  objectToArray($orderInvoice);