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
b04b1190
Commit
b04b1190
authored
Apr 13, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
10d194ea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
Broker.php
application/api_broker/controller/Broker.php
+2
-0
Shop.php
application/api_broker/controller/Shop.php
+8
-8
No files found.
application/api_broker/controller/Broker.php
View file @
b04b1190
...
@@ -283,6 +283,7 @@ class Broker extends Basic
...
@@ -283,6 +283,7 @@ class Broker extends Basic
$data
[
'user_info'
]
=
$user_res
;
$data
[
'user_info'
]
=
$user_res
;
$data
[
'user_date'
]
=
$orderLog
->
selectListByUserId
(
$user_id
,
''
);
$data
[
'user_date'
]
=
$orderLog
->
selectListByUserId
(
$user_id
,
''
);
$data
[
'user_history'
]
=
$records_result
;
$data
[
'user_history'
]
=
$records_result
;
$data
[
'agent_path'
]
=
AGENTHEADERIMGURL
;
return
$this
->
response
(
"200"
,
"success!"
,
$data
);
return
$this
->
response
(
"200"
,
"success!"
,
$data
);
}
}
...
@@ -301,6 +302,7 @@ class Broker extends Basic
...
@@ -301,6 +302,7 @@ class Broker extends Basic
}
}
$orderLog
=
new
OrderLogService
();
$orderLog
=
new
OrderLogService
();
$data
=
$orderLog
->
selectListByUserId
(
$params
[
"user_id"
],
$params
[
"keyword"
]);
$data
=
$orderLog
->
selectListByUserId
(
$params
[
"user_id"
],
$params
[
"keyword"
]);
$data
[
'agent_path'
]
=
AGENTHEADERIMGURL
;
return
$this
->
response
(
"200"
,
"request success"
,
$data
);
return
$this
->
response
(
"200"
,
"request success"
,
$data
);
}
}
...
...
application/api_broker/controller/Shop.php
View file @
b04b1190
...
@@ -226,14 +226,14 @@ class Shop extends Basic
...
@@ -226,14 +226,14 @@ class Shop extends Basic
$conditions
[
'a.id'
]
=
array
(
"eq"
,
$params
[
"id"
]
);
$conditions
[
'a.id'
]
=
array
(
"eq"
,
$params
[
"id"
]
);
$result
=
$this
->
gHousesModel
->
getHouseDetailById
(
$field
,
$conditions
);
$result
=
$this
->
gHousesModel
->
getHouseDetailById
(
$field
,
$conditions
);
$result
[
"rent_price"
]
=
$result
[
"rent_price"
]
*
0.01
;
$result
[
"rent_price"
]
=
$result
[
"rent_price"
]
*
0.01
;
$result
[
"management_fee"
]
=
$result
[
"management_fee"
]
*
0.01
;
$result
[
"management_fee"
]
=
$result
[
"management_fee"
]
*
0.01
;
$result
[
"slotting_fee"
]
=
$result
[
"slotting_fee"
]
*
0.01
;
$result
[
"slotting_fee"
]
=
$result
[
"slotting_fee"
]
*
0.01
;
$result
[
"start_business_date"
]
=
date
(
"Y-m-d"
,
strtotime
(
$result
[
"start_business_date"
]));
$result
[
"start_business_date"
]
=
empty
(
$result
[
"start_business_date"
])
?
""
:
date
(
"Y-m-d"
,
strtotime
(
$result
[
"start_business_date"
]));
$result
[
"opening_date"
]
=
date
(
"Y-m-d"
,
strtotime
(
$result
[
"opening_date"
]));
$result
[
"opening_date"
]
=
empty
(
$result
[
"start_business_date"
])
?
""
:
date
(
"Y-m-d"
,
strtotime
(
$result
[
"opening_date"
]));
$result
[
"api_path"
]
=
CK_IMG_URL
.
'images/'
;
$result
[
"api_path"
]
=
CK_IMG_URL
.
'images/'
;
$param
[
"house_id"
]
=
$params
[
'id'
];
$param
[
"house_id"
]
=
$params
[
'id'
];
//todo 这里的是否要更改成b端后台上传的类型
//todo 这里的是否要更改成b端后台上传的类型
$param
[
"img_type"
]
=
2
;
$param
[
"img_type"
]
=
2
;
$result
[
"images"
]
=
$this
->
gHousesImgModel
->
getHouseImages
(
$param
,
15
);
$result
[
"images"
]
=
$this
->
gHousesImgModel
->
getHouseImages
(
$param
,
15
);
...
...
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