Merge branch 'zjl_cancel_order_20190213' into development

app/Http/Controllers/OrderCountController.php

@@ -162,6 +162,11 @@ Class OrderCountController extends Controller
         $map['checkStatus']      = $request->input('checkStatus', '1'); // 默认选择查询全部
         $map['checkStatus']      = $request->input('checkStatus', '1'); // 默认选择查询全部
         $map['order_goods_type'] = $request->input('type', '1');
         $map['order_goods_type'] = $request->input('type', '1');
 
 
+        // 非尽调账号取真实数据
+        if ($request->user->email != 'vpadmin@ichunt.com') {
+            $map['is_fake'] = 0;
+        }
+
         $url = Config('website.api_domain').'order/getOrderAmount';
         $url = Config('website.api_domain').'order/getOrderAmount';
 
 
         $data['k1']  = time();
         $data['k1']  = time();