计算2

application/index/controller/Finance.php

@@ -1425,7 +1425,6 @@ class Finance extends Basic
 
         $pageSize     = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
         $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
-        $where['e.status'] = ['in', '10,11,13'];
         $operation_start_data = $operation_end_data = $income_date = $operation_date = '';
 
         /**收佣日期 start**/

application/model/OPartialCommission.php

@@ -218,7 +218,7 @@ class OPartialCommission extends BaseModel
     public function getCommissionTotalList($pageNo = 1, $pageSize = 15, $field = '', $params = '', $operation_start_data, $operation_end_data)
     {
         $agent_id = $this->alias('a')
-            ->field('a.agent_id,d.name,d.store_id,d.district_id')
+            ->field('a.agent_id,d.name,d.store_id,d.district_id,e.status')
             ->join('o_real_income b', 'a.real_income_id = b.id', 'left')
             ->join('o_taxes c', 'a.agent_id = c.agent_id', 'left')
             ->join('a_agents d', 'a.agent_id = d.id', 'left')
@@ -237,9 +237,18 @@ class OPartialCommission extends BaseModel
         $m_tax = new OTaxes();
         $result = [];
         foreach ($agent_id as $k=>$v) {
-            $partial_where['a.agent_id'] =$v['agent_id'];
-            $partial_where['c.income_time'] = $taxes_where['a.operation_date'] = ['between', [$operation_start_data, $operation_end_data]];
-            $result[$k] = $this->getSumMoney($field, $partial_where);
+
+            if (in_array($v['status'], [10,11,13])) {
+                $partial_where['a.agent_id'] =$v['agent_id'];
+                $partial_where['c.income_time'] = $taxes_where['a.operation_date'] = ['between', [$operation_start_data, $operation_end_data]];
+                $result[$k] = $this->getSumMoney($field, $partial_where);
+            } else {
+                $result[$k]['practical_fee'] = 0;
+                $result[$k]['real_fee'] = 0;
+                $result[$k]['service_charge'] = 0;
+                $result[$k]['charity_fund'] = 0;
+            }
+
 
             $taxes_where['a.agent_id'] = $v['agent_id'];
             $result[$k]['fee'] = $m_tax->sumBargainFee('a.fee', $taxes_where);