1

application/index/controller/Finance.php

@@ -781,15 +781,38 @@ class Finance extends Basic
         $where['a.confirm_status'] = 1;
         $where['a.is_del']         = 0;
         if (!empty($this->params['create_time']) && empty($this->params['end_time'])) {
-            $where['a.confirm_date'] = [ '>= time', $this->params['create_time'] . ' 00:00:00' ];
+            $income_where['income_time'] = [ '>= time', $this->params['create_time'] . ' 00:00:00' ];
         }
 
         if (!empty($this->params['end_time']) && empty($this->params['create_time'])) {
-            $where['a.confirm_date'] = [ '<= time', $this->params['create_time'] . ' 23:59:59' ];
+            $income_where['income_time'] = [ '<= time', $this->params['end_time'] . ' 23:59:59' ];
         }
 
         if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
-            $where['a.confirm_date'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['create_time'] . ' 23:59:59' ] ];
+            $income_where['income_time'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
+        }
+
+        if (!empty($income_where)) {
+            $m_real = new ORealIncome();
+            $bargain_arr = $m_real->getRealIncomeBargain('bargain_id', $income_where);
+
+            if ($bargain_arr['status'] == 'successful') {
+
+                if (empty($bargain_arr['data'])) {
+                    return $this->response(200, '');
+                }
+
+                foreach ($bargain_arr['data'] as $v) {
+                    $bargain_id[] = $v['bargain_id'];
+                }
+
+                if (!empty($bargain_id)) {
+                    $bargain_id_string = implode(',', $bargain_id);
+                    $where[] = ['EXP', 'b.id in ('.$bargain_id_string.') or b.father_id in ('.$bargain_id_string.')'];
+                }
+            } else {
+                return $this->response(101, '内部错误：'.$bargain_arr['msg']);
+            }
         }
 
         if (!empty($this->params['internal_address'])) {
@@ -1448,7 +1471,7 @@ class Finance extends Basic
             $pageSize = 25000;
             $result_data     = $m_bargain->getCommissionTotalListV2($pageNo, $pageSize, 'a.agent_id desc', $fields, $where, $operation_start_data, $operation_end_data);
 
-            if ($result_data['status'] == 'succesful') {
+            if ($result_data['status'] == 'successful') {
                 $data = $result_data['data'];
                 foreach ($data as $k => $v) {
                     $excel_data[$k]['income_date']       = $income_date;   //收佣日期