时间轴-成交报告

application/api_broker/service/OrderLogService.php

@@ -565,11 +565,22 @@ 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) {
-            $bargain_data_arr = $this->arr2TreeBargain($bargainData);
-            foreach ($bargain_data_arr as $k => $v) {
+            foreach ($bargainData as $k=>$v) {
+                if ($v['father_id'] == 0) {
                     $sort++;
                     $result[$sort]['step_name'] = "bargain";
-                $result[$sort]['list'] = $v;
+                    $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) {
+                $result[$sort]['list'] = $v2;
             }
         }