Skip to content

T
tl_estate
Commit e4b6d7f4 authored by clone's avatar clone
Browse files
Options

bug

parent c50506b7
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
application/api_broker/controller/Shop.php
View file @ e4b6d7f4
......@@ -106,8 +106,8 @@ class Shop extends Basic
}
if (isset($params['start_time']) && isset($params['end_time'])) {
$start_time = date('Y-m-d H:i:s',$params['start_time']);
$end_time = date('Y-m-d H:i:s',$params['end_time']);
$start_time = date('Y-m-d H:i:s', $params['start_time']);
$end_time = date('Y-m-d H:i:s', $params['end_time']);
$conditions['create_time'] = array( 'between', array( $start_time, $end_time ) );
}
......@@ -179,9 +179,9 @@ class Shop extends Basic
}
if (!empty($conditions)) {
$conditions['status'] = array( 'eq', 1 ); //只显示上架
if ($params['site_area'] == 1 || $params['site_area'] == 2){
if ($params['site_area'] == 1 || $params['site_area'] == 2) {
$conditions['is_show'] = array( 'eq', 0 ); //c端只显示可显示的楼盘
}elseif ($params["site_area"] == 4){
} elseif ($params["site_area"] == 4) {
$conditions['status'] = array( 'in', "1,2" ); //b端搜索显示上架下架的
}
}
......@@ -224,12 +224,12 @@ class Shop extends Basic
public function getShopDetail()
{
header('Access-Control-Allow-Origin:*');
/* $params = array(
"id" => 3084,
"site_area" => 3, //1.c端 3.b端
"site_area" => 1, //1.c端 3.b端
//"user_id" => 2 //if c端 用户登录后传入user_id
);*/
/* $params = array(
"id" => 3084,
"site_area" => 3, //1.c端 3.b端
"site_area" => 1, //1.c端 3.b端
//"user_id" => 2 //if c端 用户登录后传入user_id
);*/
$params = $this->params;
$conditions = [];
......@@ -242,23 +242,23 @@ class Shop extends Basic
if ($params['site_area'] == 1) {
$field = "a.id,a.external_title as title,a.external_address as address,a.city,a.disc,a.business_district_id,a.status,
$field = "a.id,a.external_title as title,a.external_address as address,a.city,a.disc,a.business_district_id,a.status,
a.industry_type,a.shop_area_start,a.shop_area_end,a.shop_type,a.residue_num,a.shop_sign,a.is_carefully_chosen,a.rent_type,
a.rent_price,a.management_fee,a.slotting_fee,a.total,a.market_area,a.is_has_gas,a.file_path,a.longitude,a.latitude,
b.enter_num,b.external_item_advantage as item_advantage,b.sign_rule,b.do_business_date, b.opening_date,b.traffic,
b.auditorium,b.tiny_brochure_url,b.start_business_date,b.fee_rule";
$conditions['a.status'] = array( "eq", 1 );
$conditions['a.is_show'] = array( 'eq', 0 ); //c端只显示公开楼盘
} else {
$field = "a.id,a.internal_title as title,a.internal_address as address,a.city,a.disc,a.business_district_id,a.status,
$field = "a.id,a.internal_title as title,a.internal_address as address,a.city,a.disc,a.business_district_id,a.status,
a.industry_type,a.shop_area_start,a.shop_area_end,a.shop_type,a.residue_num,a.shop_sign,a.is_carefully_chosen,a.rent_type,
a.rent_price,a.management_fee,a.slotting_fee,a.total,a.market_area,a.is_has_gas,a.file_path,a.longitude,a.latitude,
b.enter_num,b.internal_item_advantage as item_advantage,b.sign_rule,b.do_business_date, b.opening_date,b.traffic,
b.auditorium,b.tiny_brochure_url,b.start_business_date,a.upload_id,b.fee_rule,b.landlord_remark,a.create_time,b.landlord_phone";
$conditions['a.status'] = array( "neq", 3 );
}
$conditions['a.id'] = array( "eq", $params["id"] );
$conditions['a.status'] = array( "neq", 3 );
$result = $this->gHousesModel->getHouseDetailById($field, $conditions);
......@@ -282,12 +282,12 @@ class Shop extends Basic
$result["api_path"] = CK_IMG_URL . 'images/';
$param["house_id"] = $params['id'];
//todo 这里的是否要更改成b端后台上传的类型
$param["img_type"] = 2;
$result["images"] = $this->gHousesImgModel->getHouseImages($param, 15);
$param["img_type"] = 3;//图片类型:1效果图，2实景图，3样板图，4户型图，5交通图
$result["plan_images"] = $this->gHousesImgModel->getHouseImages($param, 1);
$result["plan_images"] = [];
$result['landlord_phone'] = json_decode ($result['landlord_phone'], true);
$param["img_type"] = 2;
$result["images"] = $this->gHousesImgModel->getHouseImages($param, 15);
$param["img_type"] = 3;//图片类型:1效果图，2实景图，3样板图，4户型图，5交通图
$result["plan_images"] = $this->gHousesImgModel->getHouseImages($param, 1);
$result["plan_images"] = [];
$result['landlord_phone'] = json_decode($result['landlord_phone'], true);
$result['create_time'] = date('Y-m-d', strtotime($result['create_time']));
if ($result['status'] == 0) {
......@@ -304,9 +304,9 @@ class Shop extends Basic
}
//todo 查询成交报告中的提交的业态拼接到已入驻中
$bargainModel = new OBargainModel();
$str = $bargainModel->selectBargainListByHouseId($params["id"]);
$result["enter_num"] .= $str;
$bargainModel = new OBargainModel();
$str = $bargainModel->selectBargainListByHouseId($params["id"]);
$result["enter_num"] .= $str;
$verify = new VerifyService();
$agentId = $verify->getPanpartyAgentsByHouseId($params["id"]);
......@@ -426,8 +426,8 @@ class Shop extends Basic
$img = new GHousesImgs();
$id = $img->getHouseImagesInfo('id', [
'house_id' => $this->params['house_id'],
'img_name' => $this->params['save_path'],
'house_id' => $this->params['house_id'],
'img_name' => $this->params['save_path'],
'img_status' => 0
]);
......
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