Merge branch 'master' of http://git.huxiukeji.com/lizhen/lanjingling

application/common/service/OrderService.php

@@ -250,7 +250,12 @@ class OrderService
             $orderWhere['company_id'] = $companyId;
             $orderWhere['next_date'] = ['neq',''];
             $orderWhere['status'] = 3;//状态:2=待处理,3=已完成,4=已取消
-            $order = Db::name('order')->field('id,user_car_id,user_car_number,next_date')->where($orderWhere)->group('user_car_id')->order('finish_time desc')->select();
+            $subQuery = Db::name('order')->alias('o')->where($orderWhere)
+                ->order(['finish_time' => 'desc'])
+                ->buildSql(); //构建查询语句
+
+            $order = Db::table($subQuery)->alias('o')->field('id,user_car_id,user_car_number,next_date')
+                ->group('user_car_id')->order('finish_time desc')->select();
             $row = [];
             if (!empty($order)) {
                 foreach ($order as $key => $value) {