恢复

application/api/controller/AppointmentTime.php

@@ -237,7 +237,7 @@ class AppointmentTime extends Basic
     public function getYetListV2($pageNo, $pageSize, $params)
     {
         $field               = "a.id,a.report_agent_phone as phone,a.report_agent_id as agents_id,a.predict_see_time as expect_time,b.house_id,
-        d.external_title as house_title,d.residue_num as room_num_left, d.is_show,d.status,d.external_image_id,d.is_show_image,c.id as march_in_id";
+        d.external_title as house_title,d.residue_num as room_num_left, d.is_show,d.status,d.external_image_id,d.is_show_image";
         $where_["a.user_id"] = $params["user_id"];
         // $result              = $this->appointmentTimeModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
         $result = $this->reportModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
@@ -264,7 +264,7 @@ class AppointmentTime extends Basic
                 }
             }
 
-            $result[$key]["is_evaluate"] = $this->isEvaluate($val["march_in_id"],$params["user_id"]);
+            $result[$key]["is_evaluate"] = $this->isEvaluate($val["id"],$params["user_id"]);
         }
         return $result;
     }
@@ -309,7 +309,7 @@ class AppointmentTime extends Basic
     public function getWaitListV2($pageNo, $pageSize, $params)
     {
         $field = "a.id,a.report_agent_phone as phone,a.report_agent_id as agents_id,b.house_id,a.predict_see_time as expect_time,
-        d.external_title as house_title,d.residue_num as room_num_left,c.id as march_in_id";
+        d.external_title as house_title,d.residue_num as room_num_left";
 
 
         $where_["user_id"] = $params["user_id"];
@@ -336,7 +336,7 @@ class AppointmentTime extends Basic
                 }
             }
             //todo 是否评价
-            $evaluateResult              = $this->evaluateMode->getIsEvaluate(10, $val["march_in_id"], $params["user_id"]);
+            $evaluateResult              = $this->evaluateMode->getIsEvaluate(10, $val["id"], $params["user_id"]);
             $result[$key]["is_evaluate"] = count($evaluateResult) > 0 ? 1 : 0;
         }
         return $result;

application/api_broker/controller/OrderLog.php

@@ -93,7 +93,7 @@ class OrderLog extends Basic
 
             //评价经纪人
             $push_client = new PushClientService();
-            $push_client->record((int)$params["report_id"], (int)$params["order_id"], 0, '', (int)$this->agentId, 0, $insert_id);
+            $push_client->record((int)$params["report_id"], (int)$params["order_id"], 0, '', (int)$this->agentId, 0, $params["report_id"]);
 
             //经纬度
             if (!empty($params['longitude']) && !empty($params['latitude'])) {

application/api_broker/service/PushMessageService.php

@@ -141,7 +141,7 @@ class PushMessageService
         //意向金推送
         if ($type_source == 10) {
             $push = new PushClientService();
-            $push->record($report_id, $report_data['order_id'], 3, '', $operation_id, $report_data['user_id']);
+            $push->record($report_id, $report_data['order_id'], 3, '', $operation_id, $report_data['user_id'], $report_id);
         }
         return;
     }