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
81be80fd
Commit
81be80fd
authored
Sep 22, 2018
by
zw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
c3c45f4d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
8 deletions
+2
-8
Shop.php
application/api/controller/Shop.php
+1
-4
Shop.php
application/api_broker/controller/Shop.php
+1
-4
No files found.
application/api/controller/Shop.php
View file @
81be80fd
...
...
@@ -263,10 +263,7 @@ class Shop extends Basic
}
$result
[
"rent_price"
]
=
$result
[
"rent_price"
]
*
0.01
;
$result
[
"management_fee"
]
=
$result
[
"management_fee"
]
*
0.01
;
if
(
$result
[
"shop_type"
]
==
0
){
$result
[
"slotting_fee"
]
=
$result
[
"slotting_fee"
]
*
0.01
;
}
$result
[
"slotting_fee"
]
=
$result
[
"slotting_fee"
]
*
0.01
;
if
(
$result
[
"external_slotting_fee"
]
!=
'-1'
)
{
$result
[
"external_slotting_fee"
]
=
$result
[
"external_slotting_fee"
]
*
0.01
;
}
...
...
application/api_broker/controller/Shop.php
View file @
81be80fd
...
...
@@ -327,10 +327,7 @@ class Shop extends Basic
}
$result
[
"rent_price"
]
=
$result
[
"rent_price"
]
*
0.01
;
$result
[
"management_fee"
]
=
$result
[
"management_fee"
]
*
0.01
;
//$result["slotting_fee"] = $result["slotting_fee"] * 0.01;
if
(
$result
[
"shop_type"
]
==
0
){
$result
[
"slotting_fee"
]
=
$result
[
"slotting_fee"
]
*
0.01
;
}
$result
[
"slotting_fee"
]
=
$result
[
"slotting_fee"
]
*
0.01
;
if
(
$result
[
"external_slotting_fee"
]
!=
'-1'
)
{
$result
[
"external_slotting_fee"
]
=
$result
[
"external_slotting_fee"
]
*
0.01
;
}
...
...
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