bug

application/api_broker/controller/OrderLog.php

@@ -435,6 +435,7 @@ class OrderLog extends Basic
         return $this->response("200", "request success", $data);
     }
 
+
     /**
      * 修改成单状态
      * @return \think\Response

application/api_broker/service/OrderLogService.php

@@ -271,7 +271,7 @@ class OrderLogService
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function selectListByOrderNo($order_id)
+    public function selectListByOrderNoV3($order_id)
     {
         $result = [];
         $sort   = 0;
@@ -330,11 +330,12 @@ class OrderLogService
         }
 
         //收款
-        $field_pay_log = "id,order_no,order_id,agent_id,agent_name,type,pay_type,money,house_number,industry_type,
+        $field_pay_log = "id,order_no,father_id,order_id,agent_id,agent_name,type,pay_type,money,house_number,industry_type,
         remark,transfer_img,real_money,source,create_time";
         $payLogData    = $oPayLogModel->selectPayLogByOrderNo($field_pay_log, [ "order_id" => $order_id ]);
         if (count($payLogData) > 0) {
-            foreach ($payLogData as $k => $v) {
+            $sortPayLogData = $this->arr2tree($payLogData);
+            foreach ($sortPayLogData as $k => $v) {
                 $v["step_name"]  = "pay_log";
                 $v["img_path"]   = CHAT_IMG_URL;
                 $result[$sort++] = $v;
@@ -354,13 +355,14 @@ class OrderLogService
         }
 
         //成交报告
-        $field_bargain = "a.id,a.house_number,a.is_open,a.report_id,a.order_id,a.trade_type,a.submit_agent_id,a.industry_type,
-        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";
+        $field_bargain = "a.id,a.father_id,a.house_number,a.is_open,a.report_id,a.order_id,a.trade_type,a.submit_agent_id,a.industry_type,
+        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.is_commission";
         $bargainData   = $oBargainModel->selectBargainListByOrderNo($field_bargain, [ "order_id" => $order_id ]);
         if (count($bargainData) > 0) {
-            foreach ($bargainData as $k => $v) {
-                $v["step_name"]  = "bargain";
-                $result[$sort++] = $v;
+            $bargain_data_arr = $this->arr2TreeBargain($bargainData);
+            foreach ($bargain_data_arr as $k2 => $v2) {
+                $v2["step_name"] = "bargain";
+                $result[$sort++] = $v2;
             }
         }
 
@@ -489,7 +491,7 @@ class OrderLogService
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function selectListByOrderNoV3($order_id)
+    public function selectListByOrderNo($order_id)
     {
         $result = [];
         $sort   = 0;