Skip to content

T
tl_estate
Commit 69e4ddb2 authored by clone's avatar clone Committed by hujun
Browse files
Options

独家字段

parent 4d202437
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 47 deletions
application/api/controller/AppointmentTime.php
View file @ 69e4ddb2
......@@ -157,8 +157,9 @@ class AppointmentTime extends Basic
$param["imgtype"] = 1; //默认主图
$result[$key]["images"] = $this->dbImg->getHouseImages($param, 1);
$houseInfo = $this->houseInfoModel->getHouseDetail("room_num_left", array( "id" => $val["house_id"] ));
$houseInfo = $this->houseInfoModel->getHouseDetails("a.room_num_left,b.foreign_name", array( "a.id" => $val["house_id"] ));
$result[$key]["room_num_left"] = $houseInfo["room_num_left"];
$result[$key]["foreign_name"] = $houseInfo["foreign_name"];
}
return $result;
......@@ -174,7 +175,8 @@ class AppointmentTime extends Basic
*/
public function getYetList($pageNo, $pageSize, $params)
{
$field = "a.id,a.phpone as phone,a.agent_id as agents_id,a.receptiontime as expect_time,a.house_id,b.title as house_title,b.room_num_left";
$field = "a.id,a.phpone as phone,a.agent_id as agents_id,a.receptiontime as expect_time,a.house_id,
b.title as house_title,b.room_num_left,c.foreign_name";
$where_["a.receptiontime"] = array( "neq", "null" );
$where_["a.phpone"] = array( "eq", $params["phone"] );
......
application/api/controller/AttentionShop.php
View file @ 69e4ddb2
......@@ -73,7 +73,7 @@ class AttentionShop extends Basic
$order_ = 'a.create_time desc';
//b.room_num_left 前端显示已下架，不可点击到详情
$field = "a.id,a.house_id,b.title,b.area,b.room_area2,b.price,b.shangpu_tags,b.room_num_left";
$field = "a.id,a.house_id,b.title,b.area,b.room_area2,b.price,b.shangpu_tags,b.room_num_left,c.foreign_name";
if (!isset($params["user_id"])) {
return $this->response("101", "用户id不能为空");
......@@ -92,6 +92,7 @@ class AttentionShop extends Basic
$result[$key]["images"] = $imgArr;
}
return $this->response("200", "request success", $result);
}
......
application/api/controller/Shop.php
View file @ 69e4ddb2
......@@ -37,9 +37,9 @@ class Shop extends Basic
public function getShopList()
{
/* $params = array(
"site_area" => 1, //来源 1首页 2搜索
"title" => "尚美",
/* $params = array(
"site_area" => 2, //来源 1首页 2搜索
"title" => "尚美",
"carefully_chosen" => 0, //精选商铺--0是1否
"shangpu_type" => 0, //商铺类型（0商场，1街铺）
"disc" => "黄浦区",
......@@ -52,9 +52,11 @@ class Shop extends Basic
"pageNo" => "1",
"pageSize" => 15
);*/
$params = $this->params;
$field = "id,agent_id,title,address,city,disc,disccircles,sales,yetai,room_area,room_area2,shangpu_type,is_test,
room_num_left,shangpu_tags,carefully_chosen,price";
$field = "a.id,a.agent_id,a.title,a.address,a.city,disc,a.disccircles,a.sales,a.yetai,a.room_area,a.room_area2,
a.shangpu_type,a.is_test,a.room_num_left,a.shangpu_tags,a.carefully_chosen,a.price,b.foreign_name,b.address_detail_c,
b.foreign_advantage";
$conditions = [];
if (empty($params['site_area'])) {
......@@ -65,65 +67,65 @@ class Shop extends Basic
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
if (isset($params['title'])) {
$conditions['title'] = array( "like", "%" . trim($params['title']) . "%" );
$conditions['b.foreign_name'] = array( "like", "%" . trim($params['title']) . "%" );
}
$order_ = "";
$spTagArr = array();
switch ($params['site_area']) {
case 1:
if (isset($params['carefully_chosen']) && $params['carefully_chosen'] == 0) {
$conditions['carefully_chosen'] = array( 'eq', $params['carefully_chosen'] );
$order_ = "rate1 desc, id desc";
$conditions['a.carefully_chosen'] = array( 'eq', $params['carefully_chosen'] );
$order_ = "a.rate1 desc, a.id desc";
}
break;
case 2:
if (isset($params['disc'])) { //区域
$conditions['disc'] = array( 'eq', trim($params['disc']) );
$conditions['a.disc'] = array( 'eq', trim($params['disc']) );
}
if (isset($params['yetai'])) { //业态
$conditions['yetai'] = array( 'like', "%" . trim($params['yetai']) . "%" );
$conditions['a.yetai'] = array( 'like', "%" . trim($params['yetai']) . "%" );
}
if (isset($params['shangpu_type'])) { //商铺类型
$conditions['shangpu_type'] = array( "eq", $params['shangpu_type'] );
$conditions['a.shangpu_type'] = array( "eq", $params['shangpu_type'] );
}
//面积 room_area最小面积 room_area2最大面积 参考老版本
if (isset($params['area_start']) && isset($params['area_end'])) {
$conditions['room_area'] = array( 'between', array( $params['area_start'], $params['area_end'] ) );
$conditions['room_area2'] = array( 'between', array( $params['area_start'], $params['area_end'] ) );
$conditions['a.room_area'] = array( 'between', array( $params['area_start'], $params['area_end'] ) );
$conditions['a.room_area2'] = array( 'between', array( $params['area_start'], $params['area_end'] ) );
} else if (isset($params['area_start']) && !isset($params['area_end'])) { //100米以上不用传结束面积
$conditions['room_area'] = array( 'egt', $params['area_start'] );
$conditions['room_area2'] = array( 'egt', $params['area_start'] );
$conditions['a.room_area'] = array( 'egt', $params['area_start'] );
$conditions['a.room_area2'] = array( 'egt', $params['area_start'] );
}
if (isset($params['money_start']) && isset($params['money_end'])) { //面积
$conditions['price'] = array( 'between', array( $params['money_start'], $params['money_end'] ) );
$conditions['a.price'] = array( 'between', array( $params['money_start'], $params['money_end'] ) );
} else if (isset($params['money_start']) && !isset($params['money_end'])) {
$conditions['price'] = array( 'egt', $params['money_start'] );
$conditions['a.price'] = array( 'egt', $params['money_start'] );
}
if (isset($params['shangpu_tags']) && $params['shangpu_tags'] != "全部") { //商铺标签
$shangpuTagsArr = array_filter(explode(',', $params['shangpu_tags']));
if (count($shangpuTagsArr) == 1) {
$spTagArr['shangpu_tags'] = array( 'like', "%" . trim($shangpuTagsArr[0]) . "%" );
$spTagArr['a.shangpu_tags'] = array( 'like', "%" . trim($shangpuTagsArr[0]) . "%" );
} else {
foreach ($shangpuTagsArr as $key => $val) {
$spTagArr['shangpu_tags'][] = array( 'like', "%" . trim($val) . "%" );
$spTagArr['a.shangpu_tags'][] = array( 'like', "%" . trim($val) . "%" );
}
}
}
$order_ = "id desc";
$order_ = "a.id desc";
break;
default:
$this->response("101", "请求数据异常");
}
if (!empty($conditions)) {
//todo 测试数据？
$conditions['id'] = array( '<>', 16 );
$conditions['a.id'] = array( '<>', 16 );
//todo sales下架字段并没用处 根据room_num_left剩余铺数来判断 为0 表示下架
$conditions['room_num_left'] = array( '<>', 0 );
$conditions['show_all'] = array( 'eq', 0 ); //只显示公开的楼盘
$conditions['a.room_num_left'] = array( '<>', 0 );
$conditions['a.show_all'] = array( 'eq', 0 ); //只显示公开的楼盘
}
$result = $this->db->getHouseInfoList($pageNo, $pageSize, $order_, $field, $conditions, $spTagArr);
......@@ -150,19 +152,21 @@ class Shop extends Basic
public function getShopDetail()
{
$params = $this->params;
$field = "id,management_fee,title,address,city,room_area,room_area2,business_area,disc,disccircles,sales,slotting_fee,transfer_fee,
yetai,room_area2,shangpu_type,is_test,sellingpoint,singn_rule,business_date,start_business_date,opentime,has_gas,traffic,has_moved,
room_num_left,room_num_total,shangpu_tags,carefully_chosen,price,dish,file_path";
$field = "a.id,a.management_fee,a.title,a.address,a.city,a.room_area,a.room_area2,a.business_area,a.disc,a.disccircles,
a.sales,a.slotting_fee,a.transfer_fee, a.yetai,a.room_area2,a.shangpu_type,a.is_test,a.sellingpoint,a.singn_rule,
a.business_date,a.start_business_date,a.opentime,a.has_gas,a.traffic,a.has_moved,a.room_num_left,a.room_num_total,
a.shangpu_tags,a.carefully_chosen,a.price,a.dish,a.file_path,b.foreign_name,b.address_detail_c,
b.foreign_advantage";
$conditions = [];
if (empty($params['id'])) {
return $this->response("101", "详情id不能为空");
}
$conditions['id'] = array( "eq", $params["id"] );
$conditions['show_all'] = array( 'eq', 0 ); //只显示公开楼盘
$conditions['a.id'] = array( "eq", $params["id"] );
$conditions['a.show_all'] = array( 'eq', 0 ); //只显示公开楼盘
$result = $this->db->getHouseDetail($field, $conditions);
$result = $this->db->getHouseDetails($field, $conditions);
$result["api_path"] = IMG_PATH;
$param["house_id"] = $params['id'];
......
application/api/controller/TradeLog.php
View file @ 69e4ddb2
......@@ -42,7 +42,7 @@ class TradeLog extends Basic
public function getTradeList()
{
$params = $this->params;
/* $params = array(
/* $params = array(
"user_id" => "4",
"phone" => "18521095110",
"pageNo" => 1,
......@@ -66,9 +66,9 @@ class TradeLog extends Basic
return $this->response("200", "请求数据为空");
}
foreach ($result as $key => $val) {
$houseInfo = $this->houseInfoModel->getHouseDetail("room_num_left,title", array( "id" => $val["house_id"] ));
$houseInfo = $this->houseInfoModel->getHouseDetails("a.room_num_left,b.foreign_name", array( "a.id" => $val["house_id"] ));
$result[$key]["room_num_left"] = $houseInfo["room_num_left"];
$result[$key]["title"] = $houseInfo["title"];
$result[$key]["title"] = $houseInfo["foreign_name"];
$result[$key]["api_path"] = IMG_PATH;
$imgParam["house_id"] = $val["house_id"];
$imgParam["imgtype"] = 1; //默认主图
......
application/app/controller/Index.php
View file @ 69e4ddb2
......@@ -75,19 +75,20 @@ class Index
{
$id = $_POST["id"] ? $_POST["id"] : $_GET["id"];
$field = "id,management_fee,title,address,city,room_area,room_area2,business_area,disc,disccircles,sales,slotting_fee,transfer_fee,
yetai,room_area2,shangpu_type,is_test,sellingpoint,singn_rule,business_date,start_business_date,opentime,has_gas,traffic,
room_num_left,room_num_total,shangpu_tags,carefully_chosen,price,dish,file_path";
$field = "a.id,a.management_fee,a.title,a.address,a.city,a.room_area,a.room_area2,a.business_area,a.disc,a.disccircles,
a.sales,a.slotting_fee,a.transfer_fee, a.yetai,a.room_area2,a.shangpu_type,a.is_test,a.sellingpoint,a.singn_rule,
a.business_date,a.start_business_date,a.opentime,a.has_gas,a.traffic,a.has_moved,a.room_num_left,a.room_num_total,
a.shangpu_tags,a.carefully_chosen,a.price,a.dish,a.file_path,b.foreign_name,b.address_detail_c,
b.foreign_advantage";
$conditions = [];
if (empty($id)) {
return $this->response("101", "详情id不能为空");
}
$conditions['id'] = array( "eq", $id );
$conditions['show_all'] = array( 'eq', 0 ); //只显示公开楼盘
$conditions['a.id'] = array( "eq", $id );
$conditions['a.show_all'] = array( 'eq', 0 ); //只显示公开楼盘
$result = $this->db->getHouseDetail($field, $conditions);
$result = $this->db->getHouseDetails($field, $conditions);
if( count($result) > 0){
$result["api_path"] = IMG_PATH;
$param["house_id"] = $id;
......
application/index/view/global/navigation.html
View file @ 69e4ddb2
......@@ -22,7 +22,7 @@
<a href="/admin.php/index/banner.html"> 首页轮播图</a>
</li>
<li role="presentation" class="active">
<a href="/admin.php/index/advertising"> 首页弹框广告</a>
<a href="/admin.php/index/advertising"> 首页弹窗</a>
</li>
<li role="presentation">
<a href="/admin.php/index/users_list.html"> 用户列表</a>
......
application/model/Applies.php
View file @ 69e4ddb2
......@@ -14,6 +14,7 @@ class Applies extends Model
->field($field)
->alias("a")
->join('houseinfos b','a.house_id = b.id' ,'LEFT')
->join('houseinfo_exts c', 'c.house_id = b.id', 'LEFT')
->where($params)
->order($order_)
->limit($pageSize)
......
application/model/AttentionModel.php
View file @ 69e4ddb2
......@@ -96,6 +96,7 @@ class AttentionModel extends Model
return $this->field($field)
->alias("a")
->join('houseinfos b', 'a.house_id = b.id', 'LEFT')
->join('houseinfo_exts c', 'c.house_id = b.id', 'LEFT')
->where($params)
->order($order_)
->limit($pageSize)
......
application/model/HouseInfos.php
View file @ 69e4ddb2
......@@ -25,11 +25,12 @@ class HouseInfos extends Model
* @param $params
* @return false|\PDOStatement|string|\think\Collection
*/
function getHouseInfoList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params,$spTagsArr)
function getHouseInfoList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params, $spTagsArr)
{
return $this->dbHouseInfo
->field($field)
->alias("a")
->join('houseinfo_exts b', 'a.id = b.house_id', 'LEFT')
->where($params)
->where(function ($query) use ($spTagsArr) {
$query->whereOr($spTagsArr);
......@@ -47,14 +48,14 @@ class HouseInfos extends Model
function getAveragePrice()
{
//price
$params['rent_type'] = array( "eq", 3 ); //1.月租金 2.营业额扣点 3.每平方米租金
$params['rent_type'] = array( "eq", 3 ); //1.月租金 2.营业额扣点 3.每平方米租金
$params['room_num_left'] = array( "<>", 0 );//剩余店铺为0的不算
$sumPrice = $this->dbHouseInfo
->where($params)
->sum("price");
$count_ = $this->dbHouseInfo
$count_ = $this->dbHouseInfo
->field("id")
->where($params)
->count("id");
......@@ -75,6 +76,21 @@ class HouseInfos extends Model
->where($params)
->find($params["id"]);
}
/**
* 获取商铺详情 关联表
* @param $field
* @param $params
* @return mixed
*/
function getHouseDetails($field, $params)
{
return $data = $this->dbHouseInfo
->field($field)
->alias("a")
->join('houseinfo_exts b', 'a.id = b.house_id', 'LEFT')
->where($params)
->find($params["a.id"]);
}
function getCityList($field, $params, $group)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment