Merge branch 'zjl_export_20180730' into development

app/Http/Controllers/OrderController.php

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

resources/views/detail/changeOrder.blade.php

@@ -15,7 +15,7 @@
             <input type="hidden" name="check_failed_info" value="">
             <input type="hidden" name="change_pay_type" value="">
             
-            <?php $isNewClient = App\Http\Controllers\isNewClient($order_info['user_id']); ?>
+            <?php $isNewClient = App\Http\Controllers\isNewClient($order_info['order_goods_type'], $order_info['user_id']); ?>
             @if ($isNewClient)
             <!-- 用户来源 -->
             <p>用户来源</p>