下订单多一个total_fee，订单排序

application/api/controller/company/Order.php

@@ -34,6 +34,8 @@ class Order extends Apic
         $servicetype_id = intval(input('servicetype_id',0));
         $status  = intval(input('status',0));
 
+        $order = 'order.id desc';
+
         $where = [
             'company_id' => $this->auth->company_id,
         ];
@@ -49,7 +51,11 @@ class Order extends Apic
             $where['servicetype_id'] = $servicetype_id;
         }
         if($status){
-            $where['status'] = $status;  //状态:1=待支付,2=待处理,3=已核销(完成),4=已取消
+            $where['status'] = $status;  //状态:2=待处理,3=已核销(完成),4=已取消
+            if($status > 2){
+                $order = 'order.finish_time desc';
+            }
+
         }
 
         if(!empty($keyword))
@@ -58,7 +64,7 @@ class Order extends Apic
         }
         $list = Db::name('order')->alias('order')
             ->join('servicetype','order.servicetype_id = servicetype.id','LEFT')
-            ->field('order.id,orderno,ordertype,user_name,user_car_number,createtime,servicetype_id,server_info,status,finish_time,cancel_reason,cancel_time,servicetype.title as servicetype_title,servicetype.baoyang_switch')->where($where)->order('order.id desc')->autopage()->select();
+            ->field('order.id,orderno,ordertype,user_name,user_car_number,createtime,servicetype_id,server_info,status,finish_time,cancel_reason,cancel_time,servicetype.title as servicetype_title,servicetype.baoyang_switch')->where($where)->order($order)->autopage()->select();
 
         foreach($list as $key => &$val){
             $val['status_text'] = $this->status_text($val['status']);

application/common/library/Authcompany.php

@@ -331,9 +331,8 @@ class Authcompany
             //员工的
             $map['staff_id'] = $this->id;
         }
-        $today_pay_fee   = Db::name('order')->where($map)->sum('pay_fee');
-        $today_appen_fee = Db::name('order')->where($map)->sum('appen_fee');
-        $userinfo['today_order_totalfee'] = $today_appen_fee + $today_pay_fee;
+
+        $userinfo['today_order_totalfee'] = Db::name('order')->where($map)->sum('total_fee');;
 
         //今日新增客户
         $map = [