收款

application/index/controller/Finance.php

@@ -4020,7 +4020,8 @@ class Finance extends Basic
         $field = 'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,';
         $field .= 'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_number,a.is_dividend,a.last_transfer_time,a.industry_type,a.agent_id,d.internal_address as address,e.name as agent_name';
         $where['a.is_del'] = $where_2['a.is_del'] = $where_3['a.is_del'] = 0;
-        $where_2['a.paylog_id'] = $where['a.father_id'] = $where_3['a.pay_log_id'] = $this->params['pay_id'];
+        $where_2['a.paylog_id'] =  $where_3['a.pay_log_id'] = $this->params['pay_id'];
+        $where[] = ['EXP','a.father_id='.$this->params['pay_id']. ' OR a.order_id='.$this->params['order_id']];
         $list = $m_paylog->getAddPayLogOrderListLimit(1, 1000, '', $field, $where);
         $m_store = new AStore();
         $m_pay_adjustment = new OPayLogAdjustment();