Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_items_price_20180731

app/Http/Controllers/OrderController.php

@@ -188,7 +188,9 @@ function getSalesName($sale_id)
 // 判断用户是否为新用户 -- 第一次下单
 function isNewClient($order_goods_type, $user_id, $create_time)
 {
-    $order = DB::connection('order')->table('lie_order')->where('order_goods_type', $order_goods_type)->where('user_id', $user_id)->where('create_time', '<', $create_time)->get();
+    $half_year_time = intval($create_time - round(365 / 2) * 86400);   
+
+    $order = DB::connection('order')->table('lie_order')->where('order_goods_type', $order_goods_type)->where('user_id', $user_id)->whereBetween('create_time', [$half_year_time, $create_time-1])->get();
 
     $user = DB::connection('order')->table('lie_user_main')->where('user_id', $user_id)->first();
 
@@ -198,6 +200,8 @@ function isNewClient($order_goods_type, $user_id, $create_time)
 // 用户来源
 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();
 
     return $user->client_source;