Commit 1e2c7d90 authored by hujun's avatar hujun

办公楼退款楼盘地址

parent b2e0da38
...@@ -215,10 +215,10 @@ class OfficePayLog extends Basic ...@@ -215,10 +215,10 @@ class OfficePayLog extends Basic
foreach ($refund_data as $k => $v) { foreach ($refund_data as $k => $v) {
$refund_data[$k]['pay_create_time'] = $m_pay->getFieldValue('create_time', ['id' => $v['pay_log_id']]); $refund_data[$k]['pay_create_time'] = $m_pay->getFieldValue('create_time', ['id' => $v['pay_log_id']]);
$house_data = $m_order->getHouseInfoByOrderIdOne('a.house_id,b.internal_address', ['a.id' => $v['order_id']]); $house_data = $m_order->getHouseInfoByOrderIdOne('c.id,d.address', ['a.id' => $v['order_id']]);
if ($house_data) { if ($house_data) {
$refund_data[$k]['house_id'] = $house_data['house_id']; $refund_data[$k]['house_id'] = $house_data['id'];
$refund_data[$k]['house_address'] = $house_data['internal_address']; $refund_data[$k]['house_address'] = $house_data['address'];
} else { } else {
$refund_data[$k]['house_id'] = 0; $refund_data[$k]['house_id'] = 0;
$refund_data[$k]['house_address'] = ''; $refund_data[$k]['house_address'] = '';
......
...@@ -276,7 +276,9 @@ class OfficeOrderModel extends Model ...@@ -276,7 +276,9 @@ class OfficeOrderModel extends Model
return $this->db_ return $this->db_
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("g_houses b", "a.house_id = b.id", "left") ->join("office_o_report b","a.f_id = b.id","left")
->join("office_g_room c","a.house_id = c.id","left")
->join("office_g_building d","c.building_id = d.id","left")
->where($params) ->where($params)
->find(); ->find();
} }
......
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