Commit 7ad42ba3 authored by hujun's avatar hujun

list_3

parent 28e74c55
...@@ -4027,6 +4027,7 @@ class Finance extends Basic ...@@ -4027,6 +4027,7 @@ class Finance extends Basic
$m_agent_house = new GHousesToAgents(); $m_agent_house = new GHousesToAgents();
$m_house = new GHouses(); $m_house = new GHouses();
$m_refund = new ORefundModel(); $m_refund = new ORefundModel();
$m_agent = new AAgents();
foreach ($list as $k=>$v) { foreach ($list as $k=>$v) {
if ($v['source'] == 2) { if ($v['source'] == 2) {
$source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id'=> $v['id']]); $source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id'=> $v['id']]);
...@@ -4096,6 +4097,17 @@ class Finance extends Basic ...@@ -4096,6 +4097,17 @@ class Finance extends Basic
$m_paylog_adjustment = new OPayLogAdjustment(); $m_paylog_adjustment = new OPayLogAdjustment();
$field = 'a.create_time,a.id,b.order_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id,b.order_id,e.house_id'; $field = 'a.create_time,a.id,b.order_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id,b.order_id,e.house_id';
$list_2 = $m_paylog_adjustment->getAdjustmentListLimit(1, 1000, '', $field, $where_2); $list_2 = $m_paylog_adjustment->getAdjustmentListLimit(1, 1000, '', $field, $where_2);
foreach ($list_2 as $k => $v) {
$list_2[$k]['name'] = $m_agent->getAgentsById($v['operation_id'], 'name');
if ($v['house_id']) {
$house_data = $m_house->getHouseDetail('id,internal_address', ['id'=>$v['house_id']]);
$list_2[$k]['house_id'] = $house_data['id'];
$list_2[$k]['address'] = $house_data['internal_address'];
} else {
$list_2[$k]['house_id'] = '';
$list_2[$k]['address'] = '';
}
}
$fields = 'a.create_time,a.id,a.order_id,a.pay_log_id,a.refund_money,a.type,a.agent_id,a.agent_name,b.house_id,a.status,'; $fields = 'a.create_time,a.id,a.order_id,a.pay_log_id,a.refund_money,a.type,a.agent_id,a.agent_name,b.house_id,a.status,';
$fields .= 'd.income_time,a.type,c.store_id'; $fields .= 'd.income_time,a.type,c.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