1

application/api_broker/service/OfficeOrderLogService.php

@@ -417,8 +417,8 @@ class OfficeOrderLogService
     {
         $orderModel = new OfficeOrderModel();
         $field      = "a.id,a.order_no,a.house_id,a.house_title,b.id as report_id,b.user_id,c.user_name as user_nick,c.user_phone,
-        c.user_pic,c.sex,d.internal_address as house_address";
-        $result     = $orderModel->selectOrderDetail($field, $where_);
+        c.user_pic,c.sex,CONCAT(d.address,f.room_number) house_address";
+        $result     = $orderModel->selectOrderDetailV2($field, $where_);
         foreach ($result as $k => $v) {
             //$result[$k]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/','$1****$2',$v["user_phone"]);
             $result[$k]["user_pic"] = HEADERIMGURL . $v["user_pic"];
@@ -1223,7 +1223,7 @@ class OfficeOrderLogService
                 $condition .= "and a.house_title like '%" . trim($params['search_keyword']) . "%' ";
                 break;
             case 5:
-                $condition .= "and c.internal_address like '%" . trim($params['search_keyword']) . "%' ";
+                $condition .= "and c.title like '%" . trim($params['search_keyword']) . "%' ";
                 break;
             case 6://客户编号
                 $condition .= "and b.user_id = " . trim($params['search_keyword']);

application/model/OfficeOrderModel.php

@@ -84,11 +84,15 @@ class OfficeOrderModel extends Model
             ->select();
     }
 
+
     /**
      * 订单详情主要信息
      * @param $field
      * @param $params
      * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function selectOrderDetail($field, $params)
     {
@@ -101,9 +105,35 @@ class OfficeOrderModel extends Model
         return $this->db_
             ->field($field)
             ->alias("a")
-            ->join("o_report b", "a.f_id = b.id", "left")
+            ->join("office_o_report b", "a.f_id = b.id", "left")
+            ->join("u_users c", "b.user_id = c.id", "left")
+            ->where($where_)
+            ->select();
+    }
+
+    /**
+     * @param $field
+     * @param $params
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function selectOrderDetailV2($field, $params)
+    {
+        $where_ = [];
+        if (isset($params["order_id"])) {
+            $where_["a.id"] = $params["order_id"];
+        }
+        $where_["a.is_del"] = 0;
+        $where_["b.status"] = 0;
+        return $this->db_
+            ->field($field)
+            ->alias("a")
+            ->join("office_o_report b", "a.f_id = b.id", "left")
             ->join("u_users c", "b.user_id = c.id", "left")
-            ->join("g_houses d", "d.id = a.house_id", "left")
+            ->join("office_g_room d", "d.id = a.house_id", "left")
+            ->join("office_g_building d", "f.id = d.building_id", "left")
             ->where($where_)
             ->select();
     }
@@ -127,9 +157,9 @@ class OfficeOrderModel extends Model
                             SELECT
                               $field
                             FROM
-                                `o_order` `a`
-                            LEFT JOIN `o_report` `b` ON `a`.`f_id` = `b`.`id`
-                            LEFT JOIN `g_houses` `c` ON `a`.`house_id` = `c`.`id`
+                                `office_o_order` `a`
+                            LEFT JOIN `office_o_report` `b` ON `a`.`f_id` = `b`.`id`
+                            LEFT JOIN `office_g_room` `c` ON `a`.`house_id` = `c`.`id`
                             WHERE
                                 $params
                         )
@@ -138,9 +168,9 @@ class OfficeOrderModel extends Model
                                 SELECT
                                   $field
                                 FROM
-                                    `o_order` `a`
-                                LEFT JOIN `o_report` `b` ON `a`.`f_id` = `b`.`id`
-                                LEFT JOIN `g_houses` `c` ON `a`.`house_id` = `c`.`id`
+                                    `office_o_order` `a`
+                                LEFT JOIN `office_o_report` `b` ON `a`.`f_id` = `b`.`id`
+                                LEFT JOIN `office_g_room` `c` ON `a`.`house_id` = `c`.`id`
                                 WHERE
                                    $where_
                             )
@@ -168,8 +198,8 @@ class OfficeOrderModel extends Model
         return $this
             ->field($field)
             ->alias("a")
-            ->join("o_report b","a.f_id = b.id","left")
-            ->join("g_houses c","a.house_id = c.id","left")
+            ->join("office_o_report b","a.f_id = b.id","left")
+            ->join("office_g_room c","a.house_id = c.id","left")
             ->where($params)
             ->order("a.id desc")
             ->page($pageNo)