实收明细修改

application/index/controller/Finance.php

@@ -701,18 +701,38 @@ class Finance extends Basic
         $where['a.is_del']         = $select = 0;
 
         if (!empty($this->params['create_time']) && empty($this->params['end_time'])) {
-            $where['f.income_time'] = [ '>= time', $this->params['create_time'] . ' 00:00:00' ];
-            $select = 1;
+            $income_where['income_time'] = [ '>= time', $this->params['create_time'] . ' 00:00:00' ];
         }
 
         if (!empty($this->params['end_time']) && empty($this->params['create_time'])) {
-            $where['f.income_time'] = [ '<= time', $this->params['end_time'] . ' 23:59:59' ];
-            $select = 1;
+            $income_where['income_time'] = [ '<= time', $this->params['end_time'] . ' 23:59:59' ];
         }
 
         if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
-            $where['f.income_time'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
-            $select = 1;
+            $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'])) {
@@ -832,6 +852,14 @@ class Finance extends Basic
             $where[] = [ 'EXP', 'b.id =' . $this->params['bargain_id'] . ' or father_id=' . $this->params['bargain_id'] ];
         }
 
+        if (!empty($this->params['store_id'])) {
+            $where['e.store_id'] = $this->params['store_id'];
+        }
+
+        if (!empty($this->params['district_id'])) {
+            $where['e.district_id'] = $this->params['district_id'];
+        }
+
         $field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,charity_fund,real_fee,a.real_income_id,a.should_commission';
 
         $m_commission = new OPartialCommission();