Commit aae3a63d authored by hujun's avatar hujun

house_address

parent c4857257
...@@ -164,7 +164,7 @@ class PayLogOpen extends Basic ...@@ -164,7 +164,7 @@ class PayLogOpen extends Basic
if (isset($this->params['district_id'])) { if (isset($this->params['district_id'])) {
$where['c.district_id'] = $this->params['district_id']; $where['c.district_id'] = $this->params['district_id'];
} }
//var_dump($where);die;
$where['a.is_del'] = 0; $where['a.is_del'] = 0;
$fields = 'a.id,a.create_time,a.agent_id,a.pay_log_id,a.bargain_id,a.order_id,a.house_id,a.status,a.house_address,c.name'; $fields = 'a.id,a.create_time,a.agent_id,a.pay_log_id,a.bargain_id,a.order_id,a.house_id,a.status,a.house_address,c.name';
...@@ -173,7 +173,7 @@ class PayLogOpen extends Basic ...@@ -173,7 +173,7 @@ class PayLogOpen extends Basic
$list = $this->m_pay_open->getListCheck($pageNo, $pageSize, 'a.id desc', $fields, $where); $list = $this->m_pay_open->getListCheck($pageNo, $pageSize, 'a.id desc', $fields, $where);
if ($this->params['excel'] == 0) { if ($this->params['excel'] == 0) {
foreach ($list as $k=>$v) { foreach ($list as $k=>$v) {house_address
$log_where['open_id'] = $v['id']; $log_where['open_id'] = $v['id'];
$log_where['is_del'] = 0; $log_where['is_del'] = 0;
$log_where['status'] = 1; $log_where['status'] = 1;
...@@ -187,8 +187,6 @@ class PayLogOpen extends Basic ...@@ -187,8 +187,6 @@ class PayLogOpen extends Basic
$list[$k]['check_time'] = ''; $list[$k]['check_time'] = '';
} }
$list[$k]['agent_name'] = $v['name']; $list[$k]['agent_name'] = $v['name'];
$list[$k]['house_address'] = $m_house->getFieldOneValue('internal_address', ['id'=>$v['house_id']]);
} }
$data['list'] = $list; $data['list'] = $list;
$data['total'] = $this->m_pay_open->getListCheckTotal($where); $data['total'] = $this->m_pay_open->getListCheckTotal($where);
...@@ -284,11 +282,10 @@ class PayLogOpen extends Basic ...@@ -284,11 +282,10 @@ class PayLogOpen extends Basic
} }
$m_pay_log = new OPayLogModel(); $m_pay_log = new OPayLogModel();
$m_house = new GHouses();
$redis_service = new RedisCacheService(); $redis_service = new RedisCacheService();
$m_o_img = new OImg(); $m_o_img = new OImg();
$field = 'id,agent_id,pay_log_id,order_id,bargain_id,intro,house_id,status'; $field = 'id,agent_id,pay_log_id,order_id,bargain_id,intro,house_id,status,house_address';
$pay_open_data = $this->m_pay_open->getFind($field, $this->params['open_id']); $pay_open_data = $this->m_pay_open->getFind($field, $this->params['open_id']);
if ($pay_open_data['agent_id']) { if ($pay_open_data['agent_id']) {
...@@ -309,12 +306,6 @@ class PayLogOpen extends Basic ...@@ -309,12 +306,6 @@ class PayLogOpen extends Basic
$pay_open_data['create_time'] = ''; $pay_open_data['create_time'] = '';
} }
if ($pay_open_data['house_id']) {
$house_data = $m_house->getHouseDetail('internal_title,province,city,disc', ['id'=>$pay_open_data['house_id']]);
$pay_open_data['house_address'] = $house_data['province'].$house_data['city'].$house_data['disc'].$house_data['internal_title'];
} else {
$pay_open_data['house_address'] = '';
}
$pay_open_data['check_log'] = $this->m_pay_open_log->getAllList('operation_name,create_time', 0, ['open_id'=>$this->params['open_id']]); $pay_open_data['check_log'] = $this->m_pay_open_log->getAllList('operation_name,create_time', 0, ['open_id'=>$this->params['open_id']]);
$pay_open_data['open_images'] = $m_o_img->getImgList(['img_id'=>$this->params['open_id'],'img_type'=>5]); $pay_open_data['open_images'] = $m_o_img->getImgList(['img_id'=>$this->params['open_id'],'img_type'=>5]);
return $this->response(200, '', $pay_open_data); return $this->response(200, '', $pay_open_data);
......
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