1

application/api_broker/service/OfficeOrderLogService.php

 <?php
+
 namespace app\api_broker\service;
 /**
  * Created by PhpStorm.
@@ -555,18 +556,18 @@ class OfficeOrderLogService
         $sort   = 0;
 
         //todo 1.验证订单是否存在
-        $orderModel       = new OfficeOrderModel();
-        $oReportModel     = new OfficeOReportModel();
-        $oMarchInModel    = new OfficeOMarchInModel();
-        $followUpLogModel = new FollowUpLogModel();
-        $oPayLogModel     = new OfficeOPayLogModel();
-        $oRefundModel     = new OfficeORefundModel();
-        $oBargainModel    = new OfficeOBargainModel();
+        $orderModel             = new OfficeOrderModel();
+        $oReportModel           = new OfficeOReportModel();
+        $oMarchInModel          = new OfficeOMarchInModel();
+        $followUpLogModel       = new FollowUpLogModel();
+        $oPayLogModel           = new OfficeOPayLogModel();
+        $oRefundModel           = new OfficeORefundModel();
+        $oBargainModel          = new OfficeOBargainModel();
         $oPayLogAdjustmentModel = new OPayLogAdjustment();
-       // $oRefundLogModel        = new OfficeORefundLogRefundLogModel();
+        // $oRefundLogModel        = new OfficeORefundLogRefundLogModel();
 
 
-        $orderData = $orderModel->selectOrderByOrderId("a.f_id,a.house_title,c.address as internal_address", ["order_id" => $order_id]);
+        $orderData = $orderModel->selectOrderByOrderId("a.f_id,b.title,b.address,c.room_number", ["order_id" => $order_id]);
         //dump($orderData);
         if (count($orderData) <= 0) {
             return ["101", "找不到此订单编号"];
@@ -582,8 +583,8 @@ class OfficeOrderLogService
         }
         //报备
         $reportData[0]["step_name"]        = "report";
-        $reportData[0]["house_title"]      = $orderData[0]["house_title"];
-        $reportData[0]["internal_address"] = $orderData[0]["internal_address"];
+        $reportData[0]["house_title"]      = $orderData[0]["title"];
+        $reportData[0]["internal_address"] = $orderData[0]["address"] . " " . $orderData[0]["room_number"];
         $result[$sort++]                   = $reportData[0];
 
         //进场  march in
@@ -659,19 +660,19 @@ class OfficeOrderLogService
             }
         }
         //退款审核
-  /*      $field_turn_down       = "id,refund_id,status,remark,operation_id,operation_name,create_time";
-        $turn_down["order_id"] = $order_id;
-        $turn_down["status"]   = array("in", ("2,4"));
-        $turn_down["is_del"]   = 0;
-        $turnDownData          = $oRefundLogModel->getListAll($field_turn_down, $turn_down);
-        if (count($turnDownData) > 0) {
-            foreach ($turnDownData as $k2 => $v2) {
-                $v2["step_name"] = "refund_check";
-                $v2["img_path"]  = CHAT_IMG_URL;
-                $v2["img"]       = $this->getOImg($v2["id"], 4);
-                $result[$sort++] = $v2;
-            }
-        }*/
+        /*      $field_turn_down       = "id,refund_id,status,remark,operation_id,operation_name,create_time";
+              $turn_down["order_id"] = $order_id;
+              $turn_down["status"]   = array("in", ("2,4"));
+              $turn_down["is_del"]   = 0;
+              $turnDownData          = $oRefundLogModel->getListAll($field_turn_down, $turn_down);
+              if (count($turnDownData) > 0) {
+                  foreach ($turnDownData as $k2 => $v2) {
+                      $v2["step_name"] = "refund_check";
+                      $v2["img_path"]  = CHAT_IMG_URL;
+                      $v2["img"]       = $this->getOImg($v2["id"], 4);
+                      $result[$sort++] = $v2;
+                  }
+              }*/
         return $this->sortByTime($result);
     }
 
@@ -960,13 +961,11 @@ class OfficeOrderLogService
         $oBargainModel    = new OfficeOBargainModel();
 
 
-
         $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]);
 
 
-
         $order_ids = $report_ids = "";
         //报备
         foreach ($reportData as $k => $v) {

application/model/OfficeOrderModel.php

@@ -60,7 +60,8 @@ class OfficeOrderModel extends Model
         $result = $this->db_
             ->field($filed)
             ->alias("a")
-            ->join("g_houses b", "a.house_id = b.id", "left")
+            ->join("office_g_room b", "a.house_id = b.id", "left")
+            ->join("office_g_building c", "a.id = b.building_id", "left")
             ->where($where_)
             ->select();
         //echo $this->db_->getLastSql();