Merge branch 'zjl_export_20180730'

app/Http/Controllers/OrderController.php

@@ -186,11 +186,11 @@ function getSalesName($sale_id)
 }
 
 // 判断用户是否为新用户 -- 第一次下单
-function isNewClient($order_goods_type, $user_id)
+function isNewClient($order_id)
 {
-    $count = DB::connection('order')->table('lie_order')->where(['user_id' => $user_id, 'order_goods_type' => $order_goods_type])->count();
+    $order = DB::connection('order')->table('lie_order')->where('order_id', $order_id)->select('sale_id')->first();
 
-    return $count == 1 ? true : false;
+    return $order->sale_id == 0 ? true : false;
 }
 
 // 用户来源