Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
f3e92039
Commit
f3e92039
authored
Sep 03, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商铺详情字段修改
parent
086130bd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
19 deletions
+23
-19
Shop.php
application/api/controller/Shop.php
+14
-3
Shop.php
application/api_broker/controller/Shop.php
+9
-16
No files found.
application/api/controller/Shop.php
View file @
f3e92039
...
...
@@ -183,7 +183,6 @@ class Shop extends Basic
foreach
(
$result
as
$key
=>
$val
)
{
$result
[
$key
][
"api_path"
]
=
CK_IMG_URL
.
'images/'
;
$result
[
$key
][
"rent_price"
]
=
$val
[
"rent_price"
]
*
0.01
;
$result
[
$key
][
"title"
]
=
$val
[
"disc"
]
.
$result
[
$key
][
"title"
];
$param
[
"house_id"
]
=
$val
[
"id"
];
$param
[
"img_type"
]
=
1
;
//默认主图
...
...
@@ -224,12 +223,24 @@ class Shop extends Basic
return
$this
->
response
(
"101"
,
"请求来源错误"
);
}
/**
* `area_width` int(11) unsigned DEFAULT '0' COMMENT '面宽 * 100',
`depth` int(11) unsigned DEFAULT '0' COMMENT '进深 * 100',
`electric_quantity` int(11) unsigned DEFAULT '0' COMMENT '电量 * 100',
`voltage` int(11) unsigned DEFAULT '0' COMMENT '电压 * 100',
`exhaust_fume` tinyint(1) unsigned DEFAULT '0' COMMENT '烟管道: 0无1有',
`running_water` tinyint(1) unsigned DEFAULT '0' COMMENT '上水:0无 1有',
`downriver` tinyint(3) unsigned DEFAULT '0' COMMENT '下水: 0无1有',
`business_scope` varchar(255) DEFAULT NULL COMMENT '经营范围文字',
`decoration` tinyint(3) unsigned DEFAULT '0' COMMENT '交付装修 0否1是',
*/
$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,b.age_limit,b.payment_month,b.deposit_month,b.external_slotting_fee"
;
b.auditorium,b.tiny_brochure_url,b.start_business_date,b.fee_rule,b.age_limit,b.payment_month,b.deposit_month,b.external_slotting_fee,
b.area_width,b.depth,b.electric_quantity,b.voltage,b.exhaust_fume,b.running_water,b.downriver,b.business_scope,b.decoration"
;
$conditions
[
'a.status'
]
=
array
(
"eq"
,
1
);
$conditions
[
'a.is_show'
]
=
array
(
'eq'
,
0
);
//c端只显示公开楼盘
...
...
@@ -314,7 +325,7 @@ class Shop extends Basic
break
;
//目前只有上海和杭州其余的先不显示
}
$result
[
'yetai'
]
=
array
(
'全部'
,
'
餐饮美食'
,
'百货零售'
,
'服装
'
,
'亲子教育'
,
'休闲娱乐'
,
'办公'
,
'其他'
);
$result
[
'yetai'
]
=
array
(
'全部'
,
'
商场美食'
,
'沿街餐饮'
,
'百货超市'
,
'服饰鞋包
'
,
'亲子教育'
,
'休闲娱乐'
,
'办公'
,
'其他'
);
//租金租金(0:租金-大于三万; 1:租金一万到三万之间; 2:租金-小于一万)
$result
[
'money'
]
=
array
(
array
(
'id'
=>
'-1'
,
'value'
=>
'全部'
),
array
(
'id'
=>
'0'
,
'value'
=>
'3万以上'
),
...
...
application/api_broker/controller/Shop.php
View file @
f3e92039
...
...
@@ -278,15 +278,7 @@ 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,
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
if
(
$params
[
'site_area'
]
==
3
)
{
if
(
$params
[
'site_area'
]
==
3
)
{
$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,
...
...
@@ -307,7 +299,8 @@ class Shop extends Basic
$conditions
[
'a.id'
]
=
array
(
"eq"
,
$params
[
"id"
]
);
$field
.=
',b.age_limit,b.payment_month,b.deposit_month,b.external_slotting_fee,c.agents_id'
;
$field
.=
',b.age_limit,b.payment_month,b.deposit_month,b.external_slotting_fee,c.agents_id, b.area_width,b.depth,
b.electric_quantity,b.voltage,b.exhaust_fume,b.running_water,b.downriver,b.business_scope,b.decoration,b.source'
;
$result
=
$this
->
gHousesModel
->
getHouseDetailById
(
$field
,
$conditions
);
if
(
count
(
$result
)
<=
0
)
{
return
$this
->
response
(
"101"
,
'此楼盘不存在'
);
...
...
@@ -415,7 +408,7 @@ class Shop extends Basic
}
$vip_services
=
new
VipService
();
$result
[
'is_can_edit'
]
=
$vip_services
->
vip
(
$params
[
'user_id'
],
'index/houseEdit'
);
$result
[
'is_can_edit'
]
=
$vip_services
->
vip
(
$params
[
'user_id'
],
'index/houseEdit'
);
}
$result
[
'new_sign_rule'
]
=
"付
{
$result
[
'payment_month'
]
}
押
{
$result
[
'deposit_month'
]
}
,签订
{
$result
[
'age_limit'
]
}
年"
;
...
...
@@ -432,7 +425,7 @@ class Shop extends Basic
*/
public
function
edit
()
{
return
$this
->
response
(
101
,
'请升级最新版本'
);
return
$this
->
response
(
101
,
'请升级最新版本'
);
}
/**
...
...
@@ -616,11 +609,11 @@ class Shop extends Basic
return
$this
->
response
(
"101"
,
"请求参数错误"
);
}
$result
=
$this
->
gHousesModel
->
getHouseInfo
(
'province,city,disc'
,
[
'id'
=>
$params
[
"house_id"
]]);
if
(
$result
)
{
$result
=
$this
->
gHousesModel
->
getHouseInfo
(
'province,city,disc'
,
[
'id'
=>
$params
[
"house_id"
]
]);
if
(
$result
)
{
$params
[
'province'
]
=
$result
[
0
][
'province'
]
?
$result
[
0
][
'province'
]
:
'上海市'
;
$params
[
'city'
]
=
$result
[
0
][
'city'
]
?
$result
[
0
][
'city'
]
:
'上海市'
;
$params
[
'disc'
]
=
$result
[
0
][
'disc'
]
?
$result
[
0
][
'disc'
]
:
'黄浦区'
;
$params
[
'city'
]
=
$result
[
0
][
'city'
]
?
$result
[
0
][
'city'
]
:
'上海市'
;
$params
[
'disc'
]
=
$result
[
0
][
'disc'
]
?
$result
[
0
][
'disc'
]
:
'黄浦区'
;
}
$follow_up_model
=
new
GHousesFollowUp
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment