Merge branch '0618-v3.3.2' into test

application/api/controller/OfficeShop.php

+<?php
+namespace app\api\controller;
+
+use app\api\extend\Basic;
+use think\Request;
+
+/**
+ * Created by PhpStorm.
+ * User: zw
+ * Date: 2019/6/18
+ * Time: 11:10
+ */
+
+class OfficeShop extends Basic{
+    public function __construct(Request $request = null)
+    {
+        parent::__construct($request);
+    }
+
+    /**
+     * 获取办公楼列表
+     * @return \think\Response
+     */
+    public function getShopList(){
+        $list = [];
+        if(count($list) > 0){
+            return $this->response("200","success",$list);
+        }else{
+            return $this->response("200","request null");
+        }
+    }
+
+    /**
+     * 获取详情
+     */
+    public function getShopDetail(){
+
+    }
+    public function getFilter(){
+        header('Access-Control-Allow-Origin:*');
+        $params = $this->params;
+        if (empty($params["city"])) {
+            return $this->response("101", "参数错误");
+        }
+        $city = $params["city"];
+
+        $regions                      = new Regions();
+        $cityList                     = $regions->getRegionsByCity($city);
+        $i                            = $j = 0;
+        $result["area"][$i]["city"]   = "全部";
+        $result["area"][$i]["disc"][] = "全部";
+        foreach ($cityList as $k => $v) {
+            $i++;
+            if (!empty($v["name"])) {
+                $result["area"][$i]["city"]   = $v["name"];
+                $result["area"][$i]["disc"][] = "全" . $v["name"];
+            }
+            foreach ($v["city"] as $item) {
+                if (!empty($item)) {
+                    $result["area"][$i]["disc"][] = $item;
+                }
+            }
+
+            if ($j == 0) {
+                $result["area"][$i]["business_district"][$j]['district']   = "全" . $v["name"];
+                $result["area"][$i]["business_district"][$j]['business'][] = [
+                    'id' => 0, 'name' => '全部'
+                ];
+            }
+
+            foreach ($v['business_district'] as $item2) {
+                if (!empty($item2)) {
+                    $j++;
+                    $result["area"][$i]["business_district"][$j] = $item2;
+                }
+            }
+
+            break; //目前只有上海和杭州其余的先不显示
+        }
+
+        $result['yetai'] = array('全部', '商场美食', '沿街餐饮', '百货超市', '服饰鞋包', '亲子教育', '休闲娱乐', '办公', '其他');
+
+        //租金租金(0:租金-大于三万; 1:租金一万到三万之间; 2:租金-小于一万)
+        $result['money'] = array(
+            array('id' => '-1', 'value' => '全部'), array('id' => '0', 'value' => '3万以上'),
+            array('id' => '1', 'value' => '1万-3万'), array('id' => '2', 'value' => '1万以下')
+        );
+
+        //面积
+        $result['acreage'] = array(
+            array('id' => '-1', 'value' => '全部'), array('id' => '0', 'value' => '30m²以内'),
+            array('id' => '1', 'value' => '30-60m²'), array('id' => '2', 'value' => '60-100m²'), array('id' => '3', 'value' => '100-300m²')
+            , array('id' => '4', 'value' => '300-500m²'), array('id' => '5', 'value' => '500m²以上')
+        );
+
+        $result['more'][] = "全部";
+        $labelsResult     = $this->room_labels->getLabels();
+        if (count($labelsResult) > 0) {
+            foreach ($labelsResult as $labelsKey => $labelsVal) {
+                if ($labelsVal['name']) {
+                    $result['more'][] = $labelsVal['name'];
+
+                }
+            }
+        }
+        return $this->response("200", "request success", $result);
+    }
+}
\ No newline at end of file

application/api_broker/controller/OfficeRoom.php

@@ -325,4 +325,22 @@ class OfficeRoom extends Basic
 
         return $this->response("200", 'request success', $result);
     }
+
+    /**
+     * 检查重盘
+     * @document http://showdoc.tonglianjituan.com/index.php?s=/1&page_id=874
+     * @return \think\Response
+     */
+    public function checkRepetition()
+    {
+        $result = $this->service->checkRepetition($this->params);
+        if ($result['status'] == 'fail') {
+            $this->code = 101;
+            $this->msg  = $result['msg'];
+        } else {
+            $this->data = $result['data'];
+        }
+
+        return $this->response($this->code, $this->msg, $this->data);
+    }
 }
\ No newline at end of file

application/api_broker/controller/User.php

@@ -84,7 +84,7 @@ class User extends Basic
     }
 
     /**
-     * 客户条件搜索
+     * app客户列表 搜索 我的客户
      * @return \think\Response
      */
     public function searchUser()
@@ -92,7 +92,7 @@ class User extends Basic
         $params = $this->params;
         $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
-        #接口调用类型 0：客户搜索 1：全部客户
+        #接口调用类型 0：客户搜索 1：全部客户 2：我的客户
         $app_request_source_type = !empty($params["app_request_source_type"]) ? $params["app_request_source_type"] : 0;
 
         $conditions = [];
@@ -206,7 +206,8 @@ class User extends Basic
             $conditions['entrust_type'] =$params['entrust_type'];
         }
         
-        $field = "id as user_id,sex,user_name,city,user_phone,user_status,agent_id,create_time,industry_type,price_demand,area_demand,vip,user_label,source_intro,site_ids";
+        $field = "id as user_id,sex,user_name,city,user_phone,user_status,agent_id,create_time,industry_type,
+        price_demand,area_demand,vip,user_label,source_intro,site_ids,entrust_type,concrete_industry";
         $return_user_list = $this->userModel->selectUserList($field, $conditions, $pageNo, $pageSize, "id desc");
         if (empty($return_user_list)) {
             return $this->response("200", "此条件没有找到数据");

application/index/controller/OfficeRoom.php

@@ -303,4 +303,22 @@ class OfficeRoom extends Basic
         }
         return $this->response($this->code, $this->msg, $this->data);
     }
+
+    /**
+     * 检查重盘
+     * @document http://showdoc.tonglianjituan.com/index.php?s=/1&page_id=875
+     * @return \think\Response
+     */
+    public function checkRepetition()
+    {
+        $result = $this->service->checkRepetition($this->params);
+        if ($result['status'] == 'fail') {
+            $this->code = 101;
+            $this->msg  = $result['msg'];
+        } else {
+            $this->data = $result['data'];
+        }
+
+        return $this->response($this->code, $this->msg, $this->data);
+    }
 }
\ No newline at end of file

application/index/service/OfficeRoomService.php

@@ -256,7 +256,7 @@ class OfficeRoomService
             $field = 'id,building_id,is_show,is_exclusive_type,is_rent,status,source,price_total,price,slotting_fee,';
             $field .= 'management_fee,station_start,station_end,area,floor,room_number,floor_tag,enter_date,';
             $field .= 'payment_month,deposit_month,age_limit_start,age_limit_end,is_register,is_partition,carport,decoration,';
-            $field .= 'rent_free,shop_sign,fee_rule,agent_start_time,agent_end_time,landlord_remark';
+            $field .= 'rent_free,shop_sign,fee_rule,agent_start_time,agent_end_time,landlord_remark,mansion';
             $data = $this->m_office_room->getFindData($field, ['id' => $id]);
 
             if ($data) {
@@ -626,6 +626,7 @@ class OfficeRoomService
     /**
      * 获取房源详情
      * @return array
+     * http://showdoc.tonglianjituan.com/index.php?s=/1&page_id=867
      */
     public function getOfficeRoomInfo($id,$agent_id){
 
@@ -633,7 +634,7 @@ class OfficeRoomService
         a.is_register,a.age_limit_start,a.age_limit_end,a.rent_free,a.management_fee,a.slotting_fee,a.carport,a.enter_date,
         a.is_partition,a.decoration,a.payment_month,a.deposit_month,a.source,a.create_time,a.operation_id,a.landlord_remark,
         a.fee_rule,a.update_time,b.address,a.is_exclusive_type,a.agent_start_time,a.agent_end_time,c.name as business_name,
-        a.shop_sign,b.longitude,b.latitude,b.intro,a.is_rent,a.room_number,a.is_show';
+        a.shop_sign,b.longitude,b.latitude,b.intro,a.is_rent,a.room_number,a.is_show,a.mansion';
 
         $result = $this->m_office_room->getOfficeRoomInfo($field,['a.id'=>$id]);
         if (!$result) {
@@ -1490,4 +1491,45 @@ class OfficeRoomService
         }
         return $result;
     }
+
+    /**
+     * 是否重盘
+     *
+     * @param $params
+     * @return mixed
+     */
+    public function checkRepetition($params) {
+        $result['status'] = 'fail';
+        $result['msg'] = '';
+        $result['data'] = [];
+        $check = $this->validate->scene('checkRepetition')->check($params);
+        if (false === $check) {
+            $result['msg'] = $this->validate->getError();
+            return $result;
+        }
+
+        $page_no   = empty($params['pageNo']) ? 1 : $params['pageNo'];
+        $page_size = empty($params['pageSize']) ? 15 : $params['pageSize'];
+
+        try {
+            $field = 'a.id,a.floor,a.room_number,a.mansion';
+            $where['b.city'] = $params['city'];
+            $where['a.floor'] = $params['floor'];
+            $where['a.mansion'] = $params['mansion'];
+            $list = $this->m_office_room->getRoomBuildingListLimit($page_no, $page_size, $field, $where);
+
+            if ($list) {
+                $data = [];
+                foreach ($list as $k=>$v) {
+                    $data[$k]['id'] = $v['id'];
+                    $data[$k]['address'] = $v['mansion'].'-'.$v['floor'].'-'.$v['room_number'];
+                }
+                $result['data'] = $data;
+            }
+            $result['status'] = 'successful';
+        } catch (\Exception $e) {
+            $result['msg'] = "内部错误：".$e->getMessage();
+        }
+        return $result;
+    }
 }
\ No newline at end of file

application/index/service/UserLogService.php

@@ -234,7 +234,7 @@ class  UserLogService
 
         //查询客户详情
         $field = 'id as user_id,sex,user_pic,other_pic,user_nick,user_name,user_phone,site_ids,agent_id,user_label,
-        industry_type,price_demand,area_demand,vip,user_status,entrust_type';
+        industry_type,price_demand,area_demand,vip,user_status,entrust_type,concrete_industry';
         $result = $this->userModel->getUserDetailStreamline($user_id,$field);
 
         if (count($result) <= 0) {

application/index/validate/OfficeBuildingRoomValidate.php

@@ -45,7 +45,9 @@ class OfficeBuildingRoomValidate extends Validate
         'is_carefully_chosen' => 'require|in:0,1',
         'agent_start_time' => 'require',
         'agent_end_time' => 'require',
-        'title'=>'require'
+        'title'=>'require',
+        'mansion'=>'require|length:2,255',
+        'city'=>'require|length:2,10'
     ];
 
     protected $message = [
@@ -104,7 +106,11 @@ class OfficeBuildingRoomValidate extends Validate
         'is_carefully_chosen.in' => '是否精选参数错误',
         'agent_start_time.require' => '独家开始时间必填',
         'agent_end_time.require' => '独家结束时间必填',
-        'title.require'=>'楼盘字段标题必传'
+        'title.require'=>'楼盘字段标题必传',
+        'mansion.require'=>'楼号/栋/座必传',
+        'mansion.length' => '楼号/栋/座字数要在2至255之间',
+        'city.require'=>'城市必填',
+        'city.length'=>'城市长度不正确'
     ];
 
     protected $scene = [
@@ -118,6 +124,7 @@ class OfficeBuildingRoomValidate extends Validate
         'is_carefully_chosen' => ['id', 'is_carefully_chosen'],
         'exclusive' => ['agent_start_time,agent_end_time,is_exclusive_type,id'],
         'del'=>['id'],
-        'show' => 'id,is_show'
+        'show' => 'id,is_show',
+        'checkRepetition'=>'city,floor,room_number'
     ];
 }
\ No newline at end of file

application/model/OfficeGRoom.php

@@ -203,6 +203,11 @@ class OfficeGRoom extends BaseModel
             $save_data['status'] = $data['status'];
         }
 
+        //楼号/栋/座
+        if (isset($data['mansion'])) {
+            $save_data['mansion'] = $data['mansion'];
+        }
+
         if (empty($data['id'])) {
             $save_data['operation_id'] = $agent_id; //上传人
             $save_data['create_time'] = date('Y-m-d H:i:s');
@@ -449,6 +454,29 @@ class OfficeGRoom extends BaseModel
             ->find();
     }
 
+    /**
+     * @param int $pageNo
+     * @param int $pageSize
+     * @param $field
+     * @param $params
+     * @param string $order
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    function getRoomBuildingListLimit($pageNo = 1, $pageSize = 15, $field, $params, $order = 'a.id desc')
+    {
+        return $data = $this->field($field)
+            ->alias("a")
+            ->join("office_g_building b","a.building_id=b.id","left")
+            ->where($params)
+            ->order($order)
+            ->limit($pageSize)
+            ->page($pageNo)
+            ->select();
+    }
+
     /**
      * @param $field
      * @param $params

application/route.php

@@ -1007,6 +1007,7 @@ Route::group('office', [
     'collectionListByBargainId' => [ 'api_broker/OfficePerformance/collectionListByBargainId', [ 'method' => 'POST|GET' ] ],
     'getOfficeRoomByReport'     => [ 'api_broker/OfficeRoom/getOfficeRoomByReport', [ 'method' => 'get|post' ] ],
     'followUpLog'               => [ 'api_broker/OfficeUser/followUpLog', [ 'method' => 'get|post' ] ],
+    'getHouseAddress'           => ['api_broker/OfficeRoom/checkRepetition', ['method' => 'get']], //搜索楼号/栋/座+楼层+房号
 
 ]);
 
@@ -1054,6 +1055,7 @@ Route::group('office_index', [
     'inspectionRecordDistrict/:check_status' => ['index/OfficeReport/inspectionRecordAll', ['method' => 'GET'], ['check_status' => 2]], //部门约带看
     'inspectionRecordAll/:check_status'      => ['index/OfficeReport/inspectionRecordAll', ['method' => 'GET'], ['check_status' => 3]], //全部约带看
     'getDistance'        => ['index/OfficeManage/getDistance', ['method' => 'GET']], //获取两个经纬度距离
+    'getHouseAddress'           => ['index/OfficeRoom/checkRepetition', ['method' => 'get']], //搜索楼号/栋/座+楼层+房号
 ]);
 
 Route::group('office_api', [