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
0560c436
Commit
0560c436
authored
Oct 17, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
成交报告详情-分佣提成 加分佣id
parent
afd2b589
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
Finance.php
application/index/controller/Finance.php
+1
-0
OBargainModel.php
application/model/OBargainModel.php
+2
-0
No files found.
application/index/controller/Finance.php
View file @
0560c436
...
@@ -477,6 +477,7 @@ class Finance extends Basic
...
@@ -477,6 +477,7 @@ class Finance extends Basic
}
else
{
}
else
{
$m_comm
=
new
OBargainModel
();
$m_comm
=
new
OBargainModel
();
$fields
=
'a.id,a.role,a.agent_id,a.scale,a.scale_fee,a.father_id'
;
$fields
=
'a.id,a.role,a.agent_id,a.scale,a.scale_fee,a.father_id'
;
$fields
.=
',e.id as partial_commission_id'
;
$where
[
0
]
=
[
'EXP'
,
"a.id =
{
$this
->
params
[
'id'
]
}
or a.father_id =
{
$this
->
params
[
'id'
]
}
"
];
$where
[
0
]
=
[
'EXP'
,
"a.id =
{
$this
->
params
[
'id'
]
}
or a.father_id =
{
$this
->
params
[
'id'
]
}
"
];
$where
[
'a.status'
]
=
[
'<>'
,
30
];
$where
[
'a.status'
]
=
[
'<>'
,
30
];
$data
[
'data'
]
=
$m_comm
->
getBargainPartial
(
1
,
100
,
'a.id desc'
,
$fields
,
$where
,
$this
->
params
[
'id'
]);
$data
[
'data'
]
=
$m_comm
->
getBargainPartial
(
1
,
100
,
'a.id desc'
,
$fields
,
$where
,
$this
->
params
[
'id'
]);
...
...
application/model/OBargainModel.php
View file @
0560c436
...
@@ -1034,6 +1034,8 @@ class OBargainModel extends Model
...
@@ -1034,6 +1034,8 @@ class OBargainModel extends Model
$data
=
$this
->
field
(
$fields
)
$data
=
$this
->
field
(
$fields
)
->
alias
(
'a'
)
->
alias
(
'a'
)
->
join
(
'a_agents b'
,
'a.agent_id = b.id'
,
'left'
)
->
join
(
'a_agents b'
,
'a.agent_id = b.id'
,
'left'
)
->
join
(
'o_partial_commission e'
,
'e.bargain_id = a.id'
,
'left'
)
->
where
(
$where
)
->
where
(
$where
)
->
order
(
$order_
)
->
order
(
$order_
)
->
limit
(
$pageSize
)
->
limit
(
$pageSize
)
...
...
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