Merge branch 'zjl_export_20180328' into 'master'

订单导出时添加尽调账号判断

See merge request !24

app/Http/Controllers/OrderController.php

@@ -453,6 +453,11 @@ Class OrderController extends Controller
             array('sale_name',      '推送业务员'),
         );
 
+        // 非竞调账号，则查看真实数据
+        if ($info['username'] != 'vpadmin@ichunt.com') {
+            $map['is_fake'] = 0;
+        }
+
         //获取订单列表
         $url = Config('website.api_domain').'order/getAllOrder';