bug

application/api_broker/service/OrderLogService.php

@@ -942,14 +942,27 @@ class OrderLogService
         $appointWatchShopModel = new AppointWatchShop();
 
 
+        //客户c端提交预约看铺
+        $field_appoint = "a.id,a.create_time,b.user_name as name";
+        $appointData = $appointWatchShopModel->getAppointWatchOur(1,15,"a.id desc",$field_appoint,["a.user_id"=>$user_id]);
+        if (count($appointData) > 0) {
+            foreach ($appointData as $k => $v) {
+                $v["step_name"] = "appoint";
+                $v["step"] = "提交预约看铺";
+                $result[$sort++] = $v;
+            }
+        }
 
         $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) {
+        if (count($appointData) > 0 && count($reportData) <= 0) {
+            return $this->sortByTime($result);
+        }elseif(count($appointData) <= 0 && count($reportData) <= 0){
             return [];
         }
 
+
         $order_ids = $report_ids = "";
         //报备
         foreach ($reportData as $k => $v) {
@@ -970,16 +983,6 @@ class OrderLogService
 
         $reportParams["report_id"] = array("in", $report_ids);
 
-        //客户c端提交预约看铺
-        $field_appoint = "a.id,a.create_time,b.user_name as name";
-        $appointData = $appointWatchShopModel->getAppointWatchOur(1,15,"a.id desc",$field_appoint,["a.user_id"=>$user_id]);
-        if (count($appointData) > 0) {
-            foreach ($appointData as $k => $v) {
-                $v["step_name"] = "appoint";
-                $v["step"] = "提交预约看铺";
-                $result[$sort++] = $v;
-            }
-        }
 
         //进场  march in
         $field_march_in = "a.id,a.reception_id,a.create_time,b.id as order_id,b.house_id,b.house_title,c.id as agent_id,c.name,c.img,d.store_name";