Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -168,8 +168,8 @@ class ConsoleController extends BaseController
         }
 
         //$notice[] = ['title' => '节日期间官方技术服务电话2号：17189513228', 'action' => '', 'page' => ''];
-        $notice[] = ['title' => '快速设置：客户下单自动计算跑腿费', 'action' => '查看', 'page' => '/admin/book/detail?id=auto_calc_pt_fee'];
-        $notice[] = ['title' => '订单上如何一键呼叫跑腿', 'action' => '查看', 'page' => '/admin/book/detail?id=one_call_pt'];
+        //$notice[] = ['title' => '快速设置：客户下单自动计算跑腿费', 'action' => '查看', 'page' => '/admin/book/detail?id=auto_calc_pt_fee'];
+        //$notice[] = ['title' => '订单上如何一键呼叫跑腿', 'action' => '查看', 'page' => '/admin/book/detail?id=one_call_pt'];
 
         $mainId = $this->mainId;
         $respond = StatSaleClass::profile($mainId);

app-mall/controllers/OrderController.php

@@ -87,9 +87,10 @@ class OrderController extends BaseController
         ];
         $originalLng = doubleval($post['user_lng']);
         $originalLat = doubleval($post['user_lat']);
+        $userName = !empty($post['user_name']) ? $post['user_name'] : '游客';
         $orderData = [
             'wx_store_id' => $wxStoreId,
-            'user_name' => $post['user_name'],
+            'user_name' => $userName,
             'user_phone' => $post['user_phone'],
             'user_lng' => $originalLng,
             'user_lat' => $originalLat,