Merge remote-tracking branch 'origin/1210-v3.0.2' into 1210-v3.0.2

application/index/controller/Finance.php

@@ -3073,7 +3073,6 @@ class Finance extends Basic
         $pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
         $where['is_del'] = 0;
 
-
         if (!empty($this->params['id'])) {
             $where['id'] = $this->params['id'];
         }
@@ -3115,7 +3114,7 @@ class Finance extends Basic
         }
 
         if ($this->params['status'] > -1) {
-            $where['status'] = $this->params['status'] == 2 ? 2 : ['in', '0,1'];
+            $where['status'] = $this->params['status'] == 2 ? 2 : ['in', '0,1,2'];
         }
 
         $m_daily = new ODaily();
@@ -3252,11 +3251,11 @@ class Finance extends Basic
 
         $agent_fee =  $this->sumPayLogBargainByType(91, 0);//未开业中介费
         $case_fee =  $this->sumPayLogBargainByType(92, 0);//未开业案场费
-        $data['not_open_commission'] = $agent_fee + $case_fee; //中介费入账
+        $data['not_open_commission'] = $agent_fee + $case_fee; //未开业佣金
 
         $open_agent_fee =  $this->sumPayLogBargainByType(91, 1);//开业中介费
         $open_case_fee =  $this->sumPayLogBargainByType(92, 1);//开业案场费
-        $data['open_commission'] = $open_agent_fee + $open_case_fee; //案场费入账
+        $data['open_commission'] = $open_agent_fee + $open_case_fee; //已开业佣金
 
         //佣金总计：中介费入账+案场费入账-中介费退款-案场费退款
         $data['total_commission'] = $data['not_open_commission'] + $data['open_commission'];