Commit 97043ac3 authored by hujun's avatar hujun

1

parent 1f9a4321
......@@ -565,19 +565,6 @@ 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";
$bargainData = $oBargainModel->selectBargainListByOrderNo($field_bargain, [ "order_id" => $order_id ]);
if (count($bargainData) > 0) {
// foreach ($bargainData as $k=>$v) {
// if ($v['father_id'] == 0) {
// $sort++;
// $result[$sort]['step_name'] = "bargain";
// $result[$sort]['trade_type'] = $v['trade_type'];
// $result[$sort]['house_number'] = $v['house_number'];
// $result[$sort]['industry_type'] = $v['industry_type'];
// $result[$sort]['price'] = $v['price'];
// $result[$sort]['commission'] = $v['commission'];
// $result[$sort]['is_open'] = $v['is_open'];
// }
// }
$bargain_data_arr = $this->arr2TreeBargain($bargainData);
foreach ($bargain_data_arr as $k2 => $v2) {
$v2["step_name"] = "bargain";
......@@ -640,7 +627,7 @@ class OrderLogService
$tree[$v["father_id"]]['is_open'] = $v['is_open'];
}
$tree[$v["father_id"]]['list'][] = $v;
$tree[$v["father_id"]]['list_array'][] = $v;
}
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