Merge branch 'zjl_export_20180730' into development

app/Http/Controllers/OrderController.php

@@ -200,6 +200,8 @@ function isNewClient($order_goods_type, $user_id, $create_time)
 // 用户来源
 // 用户来源
 function clientSource($user_id)
 function clientSource($user_id)
 {
 {
+    if (!$user_id) return false;
+
     $user = DB::connection('order')->table('lie_user_main')->where('user_id', $user_id)->select('client_source')->first();
     $user = DB::connection('order')->table('lie_user_main')->where('user_id', $user_id)->select('client_source')->first();
 
 
     return $user->client_source;
     return $user->client_source;