bug

application/api_broker/controller/OrderLog.php

@@ -285,11 +285,11 @@ class OrderLog extends Basic
     public function searchOrder()
     {
         $params = $this->params;
-        $params = array(
+      /*  $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", "请求参数错误");
         }

application/api_broker/controller/Shop.php

@@ -122,11 +122,11 @@ class Shop extends Basic
                 $area_start = isset($params['shop_area_start']) ? $params['shop_area_start'] : -1;
                 $area_end   = isset($params['shop_area_end']) ? $params['shop_area_end'] : -1;
                 if ($area_start >= 0 && $area_end >= 0) { //面积
-                    $conditions['shop_area_start'] = array( 'between', array( $area_start * 10000, $area_end * 10000 ) );
-                    $conditions['shop_area_end']   = array( 'between', array( $area_start * 10000, $area_end * 10000 ) );
+                    $conditions['shop_area_start'] = array( 'between', array( $area_start, $area_end ) );
+                    $conditions['shop_area_end']   = array( 'between', array( $area_start, $area_end ) );
                 } else if ($area_start >= 0 && $area_end < 0) { //100米以上不用传结束面积
-                    $conditions['shop_area_start'] = array( 'egt', $area_start * 10000 );
-                    $conditions['shop_area_end']   = array( 'egt', $area_start * 10000 );
+                    $conditions['shop_area_start'] = array( 'egt', $area_start );
+                    $conditions['shop_area_end']   = array( 'egt', $area_start  );
                 }
 
                 $price_start = isset($params['rent_price_start']) ? $params['rent_price_start'] : -1;
@@ -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'])) {

application/api_broker/service/OrderLogService.php

@@ -183,6 +183,8 @@ class OrderLogService
             //$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"];
         }
+        //todo 获取楼盘的案场权限人
+
         return $result;
     }
 

application/chat/controller/AppChat.php

@@ -16,7 +16,9 @@ use app\chat\service\ChatService;
 use app\chat\utils\RPush;
 use app\extra\RedisPackage;
 use app\model\ChatMsg;
+use app\model\GHouses;
 use app\model\GHousesExt;
+use app\model\GHousesImgs;
 use app\model\HouseImgs;
 use app\model\HouseinfoExts;
 use app\model\HouseInfos;
@@ -301,5 +303,45 @@ class AppChat extends Basic
         }
     }
 
+    public function getHouseInfoByFrom()
+    {
+        $params = $this->params;
+        $params = array(
+            'id'   => 4762,
+            'from' => 'b'
+        );
+        if (!isset($params['id']) || !isset($params['from'])) {
+            return $this->response("300", "参数不全");
+        }
+
+
+        $conditions['id'] = array( "eq", $params["id"] );
+
+        $gHousesModel = new GHouses();
+        //internal_title c端
+        if($params["from"] == "b"){
+            $field  = "id,external_title as title,shop_area_start,shop_area_end,rent_type,rent_price";
+        }else{
+            $field  = "id,internal_title as title,shop_area_start,shop_area_end,rent_type,rent_price";
+        }
+
+        $result = $gHousesModel->getHouseDetailById($field, $conditions);
+
+
+        $gHousesImgModel = new GHousesImgs();
+
+        $param["house_id"]     = $params['id'];
+        $param["img_type"]     = 1;
+        $images = $gHousesImgModel->getHouseImages($param, 1);
+
+        $data['$images'] = IMG_PATH . '/img/houseinfobackgroundimg_new.png';
+        if(count($images) > 0){
+            $result["imagename"] = IMG_PATH . $images[0]["img_name"];
+        }
+
+
+
+    }
+
 
 }