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
8b392172
Commit
8b392172
authored
Jan 29, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
getCommissionTotalList
parent
894add94
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Finance.php
application/index/controller/Finance.php
+2
-2
No files found.
application/index/controller/Finance.php
View file @
8b392172
...
...
@@ -1647,7 +1647,7 @@ class Finance extends Basic
$list
[
$k
][
'charity_fund'
]
=
0
;
}
$taxes_where
[
'
b
.agent_id'
]
=
$v
[
'agent_id'
];
$taxes_where
[
'
a
.agent_id'
]
=
$v
[
'agent_id'
];
$list
[
$k
][
'fee'
]
=
$m_tax
->
sumBargainFee
(
'a.fee'
,
$taxes_where
);
$list
[
$k
][
'income_date'
]
=
$income_date
;
...
...
@@ -1703,7 +1703,7 @@ class Finance extends Basic
$excel_data
[
$k
][
'practical_fee'
]
=
empty
(
$partial_data
[
'practical_fee'
])
?
0
:
$partial_data
[
'practical_fee'
];
//实收佣金
//税费
$taxes_where
[
'
b
.agent_id'
]
=
$v
[
'agent_id'
];
$taxes_where
[
'
a
.agent_id'
]
=
$v
[
'agent_id'
];
$excel_data
[
$k
][
'fee'
]
=
$m_tax
->
sumBargainFee
(
'a.fee'
,
$taxes_where
);
$excel_data
[
$k
][
'over_fee'
]
=
$partial_data
[
'practical_fee'
]
-
$excel_data
[
$k
][
'fee'
];
}
...
...
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