Skip to content

T
tl_estate
Commit 23b898df authored by hujun's avatar hujun
Browse files
Options

修改

parent aa4f260f
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 14 deletions
application/api_broker/service/OrderLogService.php
View file @ 23b898df
...@@ -565,22 +565,23 @@ class OrderLogService ...@@ -565,22 +565,23 @@ class OrderLogService
a.estimated_receipt_date,a.submit_agent_name, a.price,a.commission,a.role,a.agent_id,a.scale,a.scale_fee,a.create_time,b.name,b.phone"; a.estimated_receipt_date,a.submit_agent_name, a.price,a.commission,a.role,a.agent_id,a.scale,a.scale_fee,a.create_time,b.name,b.phone";
$bargainData = $oBargainModel->selectBargainListByOrderNo($field_bargain, [ "order_id" => $order_id ]); $bargainData = $oBargainModel->selectBargainListByOrderNo($field_bargain, [ "order_id" => $order_id ]);
if (count($bargainData) > 0) { if (count($bargainData) > 0) {
foreach ($bargainData as $k=>$v) { // foreach ($bargainData as $k=>$v) {
if ($v['father_id'] == 0) { // if ($v['father_id'] == 0) {
$sort++; // $sort++;
$result[$sort]['step_name'] = "bargain"; // $result[$sort]['step_name'] = "bargain";
$result[$sort]['trade_type'] = $v['trade_type']; // $result[$sort]['trade_type'] = $v['trade_type'];
$result[$sort]['house_number'] = $v['house_number']; // $result[$sort]['house_number'] = $v['house_number'];
$result[$sort]['industry_type'] = $v['industry_type']; // $result[$sort]['industry_type'] = $v['industry_type'];
$result[$sort]['price'] = $v['price']; // $result[$sort]['price'] = $v['price'];
$result[$sort]['commission'] = $v['commission']; // $result[$sort]['commission'] = $v['commission'];
$result[$sort]['is_open'] = $v['is_open']; // $result[$sort]['is_open'] = $v['is_open'];
} // }
} // }
$bargain_data_arr = $this->arr2TreeBargain($bargainData); $bargain_data_arr = $this->arr2TreeBargain($bargainData);
foreach ($bargain_data_arr as $k2 => $v2) { foreach ($bargain_data_arr as $k2 => $v2) {
$result[$sort]['list'] = $v2; $v2["step_name"] = "bargain";
$result[$sort++] = $v2;
} }
} }
...@@ -630,7 +631,16 @@ class OrderLogService ...@@ -630,7 +631,16 @@ class OrderLogService
} }
foreach ($list as $k => $v) { foreach ($list as $k => $v) {
$tree[$v["father_id"]][] = $v; if ($v['father_id'] == $v['id']) {
$tree[$v["father_id"]]['trade_type'] = $v['trade_type'];
$tree[$v["father_id"]]['house_number'] = $v['house_number'];
$tree[$v["father_id"]]['industry_type'] = $v['industry_type'];
$tree[$v["father_id"]]['price'] = $v['price'];
$tree[$v["father_id"]]['commission'] = $v['commission'];
$tree[$v["father_id"]]['is_open'] = $v['is_open'];
}
$tree[$v["father_id"]]['list'][] = $v;
} }
return $tree; return $tree;
......
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