bug

application/api_broker/controller/OrderLog.php

@@ -236,12 +236,12 @@ class OrderLog extends Basic
     public function selectReportAll()
     {
         $params = $this->params;
-     /*   if (!isset($params["order_id"])) {
+        if (!isset($params["order_id"])) {
             return $this->response("101", "请求参数错误");
-        }*/
-          $params = array(
-              "order_id" => 53630,
-          );
+        }
+        /*   $params = array(
+               "order_id" => 53630,
+           );*/
         $data = $this->service_->selectListByOrderNo($params["order_id"]);
         return $this->response("200", "request success", $data);
     }
@@ -285,11 +285,11 @@ class OrderLog extends Basic
     public function searchOrder()
     {
         $params = $this->params;
-               $params = array(
-                   "type"           => 4,  //0.客户电话 1.客户姓名 2.报备人电话 3.报备人姓名 4.商铺名称  5.商铺地址
-                   "agent_id"       => 1,
-                   "search_keyword" => "福气"
-               );
+        $params = array(
+            "type"           => 4,  //0.客户电话 1.客户姓名 2.报备人电话 3.报备人姓名 4.商铺名称  5.商铺地址
+            "agent_id"       => 1,
+            "search_keyword" => "福气"
+        );
         if (!isset($params["type"]) || !isset($params["agent_id"]) || !isset($params["search_keyword"])) {
             return $this->response("101", "请求参数错误");
         }
@@ -405,11 +405,11 @@ class OrderLog extends Basic
     public function searchAgents()
     {
         $params = $this->params;
-     /*   $params = array(
-            "keyword"   => "17", //姓名或者手机号
-            "page_no"   => 1,
-            "page_size" => 15
-        );*/
+        /*   $params = array(
+               "keyword"   => "17", //姓名或者手机号
+               "page_no"   => 1,
+               "page_size" => 15
+           );*/
         $where_ = [];
         if (!isset($params["keyword"])) {
             return $this->response("101", "请求参数错误");

application/api_broker/controller/Shop.php

@@ -190,12 +190,12 @@ class Shop extends Basic
     public function getShopDetail()
     {
 
-       /*     $params = array(
+            $params = array(
                 "id" => 5,
                 "site_area" => 1,  //1.c端  3.b端
                 "user_id" => 2 //if c端 用户登录后传入user_id
-            );*/
-        $params = $this->params;
+            );
+        //$params = $this->params;
 
         $conditions = [];
         if (empty($params['id'])) {
@@ -247,7 +247,9 @@ class Shop extends Basic
             if (count($attResult) > 0)
                 $result ["attention"] = $attResult[0]["id"];
         }
-
+        $verify = new VerifyService();
+        $agentId = $verify->getPanpartyAgentsByHouseId($params["id"]);
+        $result["panParty"] = $agentId;
 
         return $this->response("200", 'request success', $result);
     }

application/api_broker/service/OrderLogService.php

@@ -288,20 +288,8 @@ class OrderLogService
 
     private function convertFollowUp($item)
     {
-// $field_follow_up = "id,user_type,decision_maker,industry_type,area_requirement,price_requirement,province,city,
+        // $field_follow_up = "id,user_type,decision_maker,industry_type,area_requirement,price_requirement,province,city,
         // district,business_area,explain,explain_img,create_time";
-
-        /*        `user_type` tinyint(2) DEFAULT NULL COMMENT '用户类型 1 A类成交意愿较强  2 B类 中等  3 C类较弱 ',
-          `decision_maker` varchar(80) DEFAULT '' COMMENT '第一决策人',
-          `industry_type` tinyint(2) DEFAULT NULL COMMENT '租商铺做什么， 1轻餐饮  2重餐饮 3百货零售 4服装  5亲子教育  6休闲娱乐',
-          `area_requirement` tinyint(2) DEFAULT NULL COMMENT '面积要求 1 30平米内 2 30-60平米 3 60-100平米 4 100平米上',
-          `price_requirement` tinyint(2) DEFAULT NULL COMMENT '对价格的要求 1.月租金10000元以内 2.月租金10000-30000元 3.月租金30000元以上',
-          `province` varchar(125) DEFAULT '' COMMENT '省',
-          `city` varchar(125) DEFAULT '' COMMENT '市',
-          `district` varchar(125) DEFAULT '' COMMENT '区',
-          `business_area` varchar(125) DEFAULT '' COMMENT '商圈',
-          `other_area` varchar(255) DEFAULT '' COMMENT '其他地址',
-          `explain` varchar(255) DEFAULT '' COMMENT '其他说明',*/
         switch ($item["user_type"]) {
             case 1:
                 $item["user_type"] = "A类（成交意愿较强）";

application/api_broker/service/VerifyService.php

@@ -78,7 +78,7 @@ class VerifyService
     }
 
     /**
-     * 获取我的盘方
+     * 获取我的盘方 楼盘
      * @param $agent_id
      * @return false|null|\PDOStatement|string|\think\Collection
      */
@@ -101,4 +101,14 @@ class VerifyService
         }
         return null;
     }
+
+    /**
+     * 获取楼盘的盘方经纪人id
+     * @param $house_id
+     * @return false|\PDOStatement|string|\think\Collection
+     */
+    public function getPanpartyAgentsByHouseId($house_id){
+        $houseToAgentModel     = new GHousesToAgents();
+        return $houseToAgentModel->getHousesAgents($house_id);
+    }
 }
\ No newline at end of file

application/chat/controller/AppChat.php

@@ -75,8 +75,8 @@ class AppChat extends Basic
      */
     public function userChat()
     {
-        /*     $params = array(
-                 "user_id" => 10,
+   /*          $params = array(
+                 "user_id" => 118,
                  "mobile"  => "15821506182",
                  "source"  => 1  //1经纪人  2用户
              );*/

application/model/GHousesToAgents.php

@@ -160,6 +160,11 @@ class GHousesToAgents extends BaseModel
         return $result;
     }
 
+
+    public function getAgentsByHouseId($houseId){
+
+    }
+
     /**
      * 楼盘对应的经纪人信息
      *