Commit 0e643432 authored by hujun's avatar hujun

约带看id

parent 2cc18dba
...@@ -3024,19 +3024,17 @@ class Finance extends Basic ...@@ -3024,19 +3024,17 @@ class Finance extends Basic
$where['b.order_id'] = $this->params['march_id']; $where['b.order_id'] = $this->params['march_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'; $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 = $m_paylog->getAdjustmentListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where); $list = $m_paylog->getAdjustmentListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$data['total'] = $m_paylog->getAdjustmentListTotal($where); $data['total'] = $m_paylog->getAdjustmentListTotal($where);
$m_agent = new AAgents(); $m_agent = new AAgents();
$m_house = new GHouses(); $m_house = new GHouses();
$m_order = new OrderModel();
foreach ($list as $k => $v) { foreach ($list as $k => $v) {
$list[$k]['name'] = $m_agent->getAgentsById($v['operation_id'], 'name'); $list[$k]['name'] = $m_agent->getAgentsById($v['operation_id'], 'name');
$house_id = $m_order->getFieldValue('house_id', ['id'=>$v['order_id']]); if ($v['house_id']) {
if ($house_id) { $house_data = $m_house->getHouseDetail('id,internal_address', ['id'=>$v['house_id']]);
$house_data = $m_house->getHouseDetail('id,internal_address', ['id'=>$house_id]);
$list[$k]['house_id'] = $house_data['id']; $list[$k]['house_id'] = $house_data['id'];
$list[$k]['address'] = $house_data['internal_address']; $list[$k]['address'] = $house_data['internal_address'];
} else { } else {
......
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