1

application/api_broker/service/OfficeOrderLogService.php

@@ -361,9 +361,9 @@ class OfficeOrderLogService
         }
         if ($father_id > 0) { //修改办公楼已租状态
             $orderModel = new OfficeOrderModel();
-            $houseArr = $orderModel->selectOrderByOrderId("b.id,c.type", ["order_id" => $order_id]);
-            if(count($houseArr) > 0 && $houseArr[0]["type"] != 5){ //没找到楼盘和共享楼盘不改状态
-                $room_id = $houseArr[0]["id"];
+            $houseArr   = $orderModel->selectOrderByOrderId("b.id,c.type", ["order_id" => $order_id]);
+            if (count($houseArr) > 0 && $houseArr[0]["type"] != 5) { //没找到楼盘和共享楼盘不改状态
+                $room_id   = $houseArr[0]["id"];
                 $roomModel = new OfficeGRoom();
                 $roomModel->updateHouseNumByRevocationBargain($room_id);
             }
@@ -540,19 +540,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);
     }
 
@@ -1442,15 +1442,15 @@ class OfficeOrderLogService
             return null;
         }
         $houseAgents = new OfficeGRoomToAgent();
-        $fields       = "b.id,b.phone,b.name";
+        $fields      = "b.id,b.phone,b.name";
 
         switch ($type) {//1盘方，2客方，3反签，4独家，5合作方
             case 1:
                 $params["a.house_id"] = $result[0]["house_id"];
-                $params["a.type"]      = 2;
-                $params["a.is_del"]    = 0;
-                $params["b.status"]    = 0;
-                $list                  = $houseAgents->getAgentsByHouseId($fields, $params);
+                $params["a.type"]     = 2;
+                $params["a.is_del"]   = 0;
+                $params["b.status"]   = 0;
+                $list                 = $houseAgents->getAgentsByHouseId($fields, $params);
                 break;
             case 2:
                 $userModel          = new Users();
@@ -1466,10 +1466,10 @@ class OfficeOrderLogService
                 break;
             case 4:
                 $params["a.house_id"] = $result[0]["house_id"];
-                $params["a.type"]      = 3;
-                $params["a.is_del"]    = 0;
-                $params["b.status"]    = 0;
-                $list                  = $houseAgents->getAgentsByHouseId($fields, $params);
+                $params["a.type"]     = 3;
+                $params["a.is_del"]   = 0;
+                $params["b.status"]   = 0;
+                $list                 = $houseAgents->getAgentsByHouseId($fields, $params);
                 break;
             case 5:
                 return null;
@@ -1513,13 +1513,13 @@ class OfficeOrderLogService
             return null;
         }
 
-        $houseAgents                = new OfficeGRoomToAgent();
-        $fields                      = "b.id,b.phone,b.name,a.type";
+        $houseAgents               = new OfficeGRoomToAgent();
+        $fields                    = "b.id,b.phone,b.name,a.type";
         $where_house["a.house_id"] = $result[0]["house_id"];
-        $where_house["a.type"]      = ['in', '2,3'];
-        $where_house["a.is_del"]    = 0;
-        $where_house["b.status"]    = 0;
-        $agent_house                = $houseAgents->getAgentsByHouseId($fields , $where_house);
+        $where_house["a.type"]     = ['in', '2,3'];
+        $where_house["a.is_del"]   = 0;
+        $where_house["b.status"]   = 0;
+        $agent_house               = $houseAgents->getAgentsByHouseId($fields, $where_house);
 
         $list = [];
         $key  = 0;

application/model/MetroStations.php

@@ -50,9 +50,10 @@ class MetroStations extends BaseModel
 
     public function getMetroStations($field,$params)
     {
-        $result = $this
+        $result = $this->db_
             ->field($field)
             ->where($params)
+            ->order("sort_value asc")
             ->select();
         return $result;
     }

application/model/Regions.php

@@ -129,7 +129,7 @@ class Regions extends Model
     public function getRegionsByCity($city) {
         $data = [];
         $param["type"]     = 2;
-        $param["fullName"] = array( "like", "%" . trim($city) . "%" );
+        $param["fullName"] = array( "like",  trim($city) . "%" );
         $city_data = $this
             ->field('code,fullName')
             ->where($param)