查询收藏数据

application/api_broker/controller/OfficeCollectHouse.php

@@ -13,6 +13,8 @@ use app\api_broker\service\LookShopService;
 use app\api_broker\service\VipService;
 use app\model\GHousesToAgents;
 use app\model\OfficeACollectHouse;
+use app\model\OfficeGRoom;
+use app\model\OfficeGRoomToAgent;
 
 class OfficeCollectHouse extends Basic
 {
@@ -107,17 +109,12 @@ class OfficeCollectHouse extends Basic
 
         $field  = 'CollectUser.id as collect_user_id,';
         $field .= 'Houses.id,';
-        $field .= 'Houses.internal_title as title,';
+        $field .= 'Houses.title,';
         $field .= 'Houses.business_district_id,';
         $field .= 'Houses.status,';
-        $field .= 'Houses.industry_type,';
-        $field .= 'Houses.shop_area_start,';
-        $field .= 'Houses.shop_area_end,';
-        $field .= 'Houses.shop_type,';
+        $field .= 'Houses.area,';
         $field .= 'Houses.shop_sign,';
-        $field .= 'Houses.residue_num,';
-        $field .= 'Houses.rent_type,';
-        $field .= 'Houses.rent_price,';
+        $field .= 'Houses.price,';
         $field .= 'Houses.is_lock,';
         $field .= 'Houses.is_vip,';
         $field .= 'Houses.is_exclusive_type,';
@@ -132,8 +129,7 @@ class OfficeCollectHouse extends Basic
         foreach ($res as $key => $val) {
             $isLook                     = $look_shop_service->isLooked($params["agents_id"], $val["id"]);
             $res[$key]["is_look"]       = $isLook;
-            $res[$key]["rent_price"]    = $val["rent_price"] * 0.01;
-            $res[$key]["rent_price"]    = $val["rent_price"] * 0.01;
+            $res[$key]["price"]    = $val["price"] * 0.01;
 
             //锁盘后，盘方、独家方、有权限的可以查看
             $res[$key]["look_lock"] = 0;
@@ -143,10 +139,10 @@ class OfficeCollectHouse extends Basic
                     $res[$key]["look_lock"] = 1;
                 }
 
-                $m_agent = new GHousesToAgents();
-                $agent_where['a.agents_id'] = $this->agentId;
+                $m_agent = new OfficeGRoomToAgent();
+                $agent_where['a.agent_id'] = $this->agentId;
                 $agent_where['a.type'] = ['in', '2,3'];
-                $agent_where['a.houses_id'] = $val['id'];
+                $agent_where['a.house_id'] = $val['id'];
                 $agent_where['a.is_del'] = 0;
                 $agent_data = $m_agent->getAgentsHouseField('a.id', $agent_where);
 

application/api_broker/extend/Basic.php

@@ -63,6 +63,7 @@ class Basic extends Controller
         "broker/getCityInfoByMap",
         "broker/getShopListByMap",
         "broker/getUserLabels",
+        "office/filtrateConditionRoom",
     );
 
     /**

application/model/OfficeACollectHouse.php

@@ -57,7 +57,7 @@ class OfficeACollectHouse extends Model
         $result = Db::table($this->table)
             ->field($field)
             ->alias('CollectUser')
-            ->join('g_houses Houses', 'CollectUser.house_id = Houses.id', 'right')
+            ->join('office_g_room Houses', 'CollectUser.house_id = Houses.id', 'right')
             ->where($params)
             ->limit($pageSize)
             ->page($pageNo)