Commit 44316a0b authored by hujun's avatar hujun

address

parent 2f33d47a
...@@ -1456,7 +1456,6 @@ class OfficePayLog extends Basic ...@@ -1456,7 +1456,6 @@ class OfficePayLog extends Basic
$m_agent = new AAgents(); $m_agent = new AAgents();
$m_paylog = new officeOPayLogModel(); $m_paylog = new officeOPayLogModel();
$m_room = new OfficeGRoom(); $m_room = new OfficeGRoom();
$m_building = new OfficeGBuilding();
$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,';
$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';
...@@ -1500,7 +1499,6 @@ class OfficePayLog extends Basic ...@@ -1500,7 +1499,6 @@ class OfficePayLog extends Basic
} else { } else {
$list[$k]['bargain_id'] = ''; $list[$k]['bargain_id'] = '';
} }
die('111');
$list[$k]['current_agent_name'] = $list[$k]['store_name'] = ""; $list[$k]['current_agent_name'] = $list[$k]['store_name'] = "";
if ($v['type'] == 92) { if ($v['type'] == 92) {
$is_exclusive_type = $m_room->getFieldOneValue('is_exclusive_type', ['id'=>$v['house_id']]); $is_exclusive_type = $m_room->getFieldOneValue('is_exclusive_type', ['id'=>$v['house_id']]);
...@@ -1546,7 +1544,7 @@ class OfficePayLog extends Basic ...@@ -1546,7 +1544,7 @@ class OfficePayLog extends Basic
foreach ($list_2 as $k => $v) { foreach ($list_2 as $k => $v) {
$list_2[$k]['name'] = $m_agent->getAgentsById($v['operation_id'], 'name'); $list_2[$k]['name'] = $m_agent->getAgentsById($v['operation_id'], 'name');
if ($v['house_id']) { if ($v['house_id']) {
$house_data = $m_building->getFindData('id,address', ['id'=>$v['house_id']]); $house_data = $m_room->getHouseDetail('a.id,b.address', ['a.id'=>$v['house_id']]);
$list_2[$k]['house_id'] = $house_data['id']; $list_2[$k]['house_id'] = $house_data['id'];
$list_2[$k]['address'] = $house_data['address']; $list_2[$k]['address'] = $house_data['address'];
} else { } else {
...@@ -1562,7 +1560,8 @@ class OfficePayLog extends Basic ...@@ -1562,7 +1560,8 @@ class OfficePayLog extends Basic
if (empty($v['house_id'])) { if (empty($v['house_id'])) {
$list_3[$k]['address'] = ''; $list_3[$k]['address'] = '';
} else { } else {
$list_3[$k]['address'] = $m_building->getFieldOneValue('address', ['id'=>$v['house_id']]); $house_data = $m_room->getHouseDetail('b.address', ['a.id'=>$v['house_id']]);
$list_3[$k]['address'] = $house_data['address'];
} }
if (empty($v['store_id'])) { if (empty($v['store_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