Commit 07a320c9 authored by hujun's avatar hujun

bargain_id

parent b10e92d9
...@@ -4984,7 +4984,7 @@ class Finance extends Basic ...@@ -4984,7 +4984,7 @@ class Finance extends Basic
$m_agent = new AAgents(); $m_agent = new AAgents();
$m_paylog = new OPayLogModel(); $m_paylog = new OPayLogModel();
$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 = '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,a.bargain_id,';
$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'; $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['a.is_del'] = $where_2['a.is_del'] = $where_3['a.is_del'] = 0;
$where_2['a.paylog_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'];
...@@ -5016,12 +5016,12 @@ class Finance extends Basic ...@@ -5016,12 +5016,12 @@ class Finance extends Basic
} }
if ($v['type'] != 10 && $v['type'] != 30) { if ($v['type'] != 10 && $v['type'] != 30) {
$bargain_data = $this->m_bargain->getDetail('id,father_id', ['order_id'=>$v['order_id']]); // $bargain_data = $this->m_bargain->getDetail('id,father_id', ['order_id'=>$v['order_id']]);
$bargain_id = $bargain_data['id']; // $bargain_id = $bargain_data['id'];
if ($bargain_data['father_id'] != 0) { // if ($bargain_data['father_id'] != 0) {
$bargain_id = $bargain_data['father_id']; // $bargain_id = $bargain_data['father_id'];
} // }
$list[$k]['bargain_id'] = empty($bargain_id)? '':$bargain_id; $list[$k]['bargain_id'] = empty($v['bargain_id'])? '':$v['bargain_id'];
} else { } else {
$list[$k]['bargain_id'] = ''; $list[$k]['bargain_id'] = '';
} }
......
...@@ -1457,7 +1457,7 @@ class OfficePayLog extends Basic ...@@ -1457,7 +1457,7 @@ class OfficePayLog extends Basic
$m_paylog = new officeOPayLogModel(); $m_paylog = new officeOPayLogModel();
$m_room = new OfficeGRoom(); $m_room = new OfficeGRoom();
$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 = '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,a.bargain_id,';
$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,g.address,e.name as agent_name'; $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,g.address,e.name as agent_name';
$where['a.is_del'] = $where_2['a.is_del'] = $where_3['a.is_del'] = 0; $where['a.is_del'] = $where_2['a.is_del'] = $where_3['a.is_del'] = 0;
$where_2['a.paylog_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'];
...@@ -1490,12 +1490,12 @@ class OfficePayLog extends Basic ...@@ -1490,12 +1490,12 @@ class OfficePayLog extends Basic
} }
if ($v['type'] != 10 && $v['type'] != 30) { if ($v['type'] != 10 && $v['type'] != 30) {
$bargain_data = $this->m_bargain->getDetail('id,father_id', ['order_id'=>$v['order_id']]); // $bargain_data = $this->m_bargain->getDetail('id,father_id', ['order_id'=>$v['order_id']]);
$bargain_id = $bargain_data['id']; // $bargain_id = $bargain_data['id'];
if ($bargain_data['father_id'] != 0) { // if ($bargain_data['father_id'] != 0) {
$bargain_id = $bargain_data['father_id']; // $bargain_id = $bargain_data['father_id'];
} // }
$list[$k]['bargain_id'] = empty($bargain_id)? '':$bargain_id; $list[$k]['bargain_id'] = empty($v['bargain_id'])? '':$v['bargain_id'];
} else { } else {
$list[$k]['bargain_id'] = ''; $list[$k]['bargain_id'] = '';
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment