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

app/Http/Controllers/OrderCountController.php

@@ -145,6 +145,11 @@ Class OrderCountController extends Controller
         $map['checkTime'] = $checkTime = $request->input('checkTime', '1'); // 默认选择订单付款时间
         $map['checkStatus'] = $checkStatus = $request->input('checkStatus', '1'); // 默认选择查询全部
 
+        // 竞调账号
+        if ($info['username'] != 'vpadmin@ichunt.com') {
+            $map['is_fake'] = 0;
+        }
+
         // 调用API
         $url = Config('website.api_domain').'order/getAllOrder';