收藏优化

application/api_broker/controller/Shop.php

@@ -7,6 +7,7 @@ use app\api_broker\service\LookShopService;
 use app\api_broker\service\VerifyService;
 use app\api_broker\service\VipService;
 use app\index\service\HouseService;
+use app\index\service\UserLogService;
 use app\index\service\UserService;
 use app\model\AAgents;
 use app\model\ACollectHouse;
@@ -659,21 +660,9 @@ class Shop extends Basic
             }
         }
 
-
-
-        //是否被收藏
-        $result["is_collect"] = 2;
         if ($params['site_area'] == 3) {
-            //先判断是否已经存在数据
-            $field = 'id,status';
-            $get_params['agents_id'] = $params["user_id"];//实际就是agents_id，前端之前传错了，将错就错
-            $get_params['house_id'] = $params["id"];
-            $collect_house = new ACollectHouse();
-            $res = $collect_house->getCollectHouse($field, $get_params);
-            if ($res && ($res[0]['status'] == 1)) {//如果存在
-                $result["is_collect"] = 1;
-            }
-
+            #是否被收藏
+            $result["is_collect"] =$this->isCollect($params["id"], $params["user_id"]);
             $vip_services = new VipService();
             $result['is_can_edit'] = $vip_services->vip($params['user_id'], 'index/houseEdit');
         }
@@ -735,6 +724,34 @@ class Shop extends Basic
         return $this->response("200", 'request success', $result);
     }
 
+    /**
+     * 是否被收藏
+     * @param $house_id
+     * @param $agent_id
+     * @return int
+     */
+    public function isCollect($house_id, $agent_id)
+    {
+        $is_collect = 2;
+        $s_user_log = new UserLogService();
+        $field = 'id,status';
+        $agent_ids = $s_user_log->getSiteAgentId($agent_id);
+        if ($agent_ids) {
+            //此经纪人有转勤账号
+            $get_params["agents_id"] = array( 'in', $agent_ids );
+        } else {
+            $get_params["agents_id"] = $agent_id;
+        }
+
+        $get_params['house_id'] = $house_id;
+        $collect_house = new ACollectHouse();
+        $res = $collect_house->getCollectHouse($field, $get_params);
+        if ($res && ($res[0]['status'] == 1)) {//如果存在
+            $is_collect = 1;
+        }
+        return $is_collect;
+    }
+
     /**
      * 案场权限人
      * @param $house_id