收佣列表总额计算

application/index/controller/Collection.php

@@ -48,15 +48,15 @@ class Collection extends Basic
             }
 
             if (!empty($this->params['income_start_time']) && empty($this->params['income_end_time'])) {
-                $where['a.create_time'] = ['> time',$this->params['income_start_time'] . ' 00:00:00'];
+                $where['a.income_time'] = ['> time',$this->params['income_start_time'] . ' 00:00:00'];
             }
 
             if (!empty($this->params['income_end_time']) && empty($this->params['income_start_time'])) {
-                $where['a.create_time'] = ['< time',$this->params['end_time'] . ' 23:59:59'];
+                $where['a.income_time'] = ['< time',$this->params['end_time'] . ' 23:59:59'];
             }
 
             if (!empty($this->params['income_end_time']) && !empty($this->params['income_start_time'])) {
-                $where['a.create_time'] = ['between time', [
+                $where['a.income_time'] = ['between time', [
                     $this->params['income_start_time']. ' 00:00:00',$this->params['income_end_time']. ' 23:59:59'
                 ]];
             }
@@ -114,7 +114,21 @@ class Collection extends Basic
                 $data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where);
 
                 //加时间条件
-                if ($where['a.create_time']) {
+                if ($where['a.income_time'] || $where['a.create_time']) {
+                    if (!empty($this->params['income_start_time']) && empty($this->params['income_end_time'])) {
+                        $pay_where['income_time'] = ['> time',$this->params['start_time'] . ' 00:00:00'];
+                    }
+
+                    if (!empty($this->params['income_end_time']) && empty($this->params['income_start_time'])) {
+                        $pay_where['income_time'] = ['< time',$this->params['income_end_time'] . ' 23:59:59'];
+                    }
+
+                    if (!empty($this->params['income_end_time']) && !empty($this->params['income_start_time'])) {
+                        $pay_where['income_time'] = ['between time', [
+                            $this->params['income_start_time']. ' 00:00:00',$this->params['income_end_time']. ' 23:59:59'
+                        ]];
+                    }
+
                     if (!empty($this->params['start_time']) && empty($this->params['end_time'])) {
                         $pay_where['create_time'] = ['> time',$this->params['start_time'] . ' 00:00:00'];
                     }