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
90407dc2
Commit
90407dc2
authored
May 28, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
69780c3f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
OPartialCommission.php
application/model/OPartialCommission.php
+1
-1
OTaxes.php
application/model/OTaxes.php
+3
-2
No files found.
application/model/OPartialCommission.php
View file @
90407dc2
...
...
@@ -37,7 +37,6 @@ class OPartialCommission extends BaseModel
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
->
select
();
$result
=
[];
$m_agent
=
new
AAgents
();
...
...
@@ -128,6 +127,7 @@ class OPartialCommission extends BaseModel
->
join
(
'o_bargain b'
,
'a.bargain_id = b.id'
,
'left'
)
->
join
(
'o_order c'
,
'b.order_id = c.id'
,
'left'
)
->
join
(
'g_houses d'
,
'c.house_id = d.id'
,
'left'
)
->
join
(
'a_agents e'
,
'b.agent_id = e.id'
,
'left'
)
->
where
(
$where
)
->
count
();
}
...
...
application/model/OTaxes.php
View file @
90407dc2
...
...
@@ -209,13 +209,14 @@ class OTaxes extends BaseModel
*/
public
function
getTaxesListTotal
(
$params
)
{
return
$this
->
alias
(
'a'
)
$data
=
$this
->
alias
(
'a'
)
->
join
(
'o_bargain b'
,
'a.bargain_id = b.id'
,
'left'
)
->
join
(
'o_order c'
,
'b.order_id = c.id'
,
'left'
)
->
join
(
'g_houses d'
,
'c.house_id = d.id'
,
'left'
)
->
join
(
'a_agents e'
,
'b.agent_id = e.id'
,
'left'
)
->
where
(
$params
)
->
count
();
->
sum
(
"a.fee"
);
return
$data
;
}
/**
...
...
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