Merge branch 'test'

application/api_broker/service/OrderLogService.php

@@ -505,8 +505,7 @@ class OrderLogService
                 $result[$sort++] = $v;
             }
         }
-
-        $field_report = "a.id,a.create_time,a.predict_see_time,a.intro,b.id as order_id,b.house_title,c.id as agent_id,c.name,c.img,d.store_name";
+        $field_report = "a.id,a.create_time,a.predict_see_time,a.intro,b.id as order_id,b.house_id,b.house_title,c.id as agent_id,c.name,c.img,d.store_name";
 
         $reportData = $oReportModel->selectReportByUserId($field_report, ["user_id" => $user_id]);
         if (count($result) <= 0 && count($reportData) <= 0) {
@@ -518,7 +517,7 @@ class OrderLogService
         foreach ($reportData as $k => $v) {
             $v["step_name"] = "report";
             $house_title = mb_substr($v['house_title'],0,3,'utf-8')."***";
-            $v["step"] = "报备【" . $house_title  . "】";
+            $v["step"] = "报备【id:" .$v['house_id']." ". $house_title  . "】";
             $result[$sort++] = $v;
 
             $order_ids .= $v["order_id"] . ",";
@@ -540,7 +539,7 @@ class OrderLogService
             foreach ($marchInData as $k => $v) {
                 $v["step_name"] = "march_in";
                 $house_title = mb_substr($v['house_title'],0,3,'utf-8')."***";
-                $v["step"] = "进场【" . $house_title . "】";
+                $v["step"] = "进场【id:" .$v['house_id']." ". $house_title . "】";
                 $result[$sort++] = $v;
             }
         }
@@ -569,7 +568,7 @@ class OrderLogService
             foreach ($payLogData as $k => $v) {
                 $v["step_name"] = "pay_log";
                 $house_title = mb_substr($v['house_title'],0,3,'utf-8')."***";
-                $v["step"] = "收款【" . $house_title . "】";
+                $v["step"] = "收款【id:" .$v['house_id']." ". $house_title . "】";
                 $result[$sort++] = $v;
             }
         }
@@ -583,7 +582,7 @@ class OrderLogService
             foreach ($refundData as $k => $v) {
                 $v["step_name"] = "refund";
                 $house_title = mb_substr($v['house_title'],0,3,'utf-8')."***";
-                $v["step"] = "退款【" . $house_title . "】";
+                $v["step"] = "退款【id:" .$v['house_id']." ". $house_title . "】";
                 $result[$sort++] = $v;
             }
         }
@@ -595,7 +594,7 @@ class OrderLogService
             foreach ($bargainData as $k => $v) {
                 $v["step_name"] = "bargain";
                 $house_title = mb_substr($v['house_title'],0,3,'utf-8')."***";
-                $v["step"] = "成交报告【" . $house_title . "】";
+                $v["step"] = "成交报告【id:" .$v['house_id']." ". $house_title . "】";
                 $result[$sort++] = $v;
             }
         }