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
788134d1
Commit
788134d1
authored
Sep 20, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
成交报告-佣金提成修改
parent
c4e2cc97
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
OBargainModel.php
application/model/OBargainModel.php
+9
-2
No files found.
application/model/OBargainModel.php
View file @
788134d1
...
...
@@ -1081,11 +1081,19 @@ class OBargainModel extends Model
}
}
$partial_commission
=
$m_partial
->
field
(
'id,scale,practical_fee,cash,service_charge,charity_fund,real_fee,confirm_date,confirm_status,should_commission'
)
$partial_commission
=
$m_partial
->
field
(
'id,scale,practical_fee,cash,service_charge,charity_fund,real_fee,confirm_date,confirm_status,should_commission
,real_income_id
'
)
->
where
(
'bargain_id'
,
$v
[
'id'
])
->
where
(
'is_del'
,
0
)
->
order
(
"id asc"
)
->
select
();
foreach
(
$partial_commission
as
$k2
=>
$v2
)
{
$income_time
=
$m_real
->
field
(
'id,income_time'
)
->
find
(
$v2
[
'real_income_id'
]);
if
(
empty
(
$income_time
))
{
$partial_commission
[
$k2
][
'income_time'
]
=
[];
}
else
{
$partial_commission
[
$k2
][
'income_time'
]
=
$income_time
;
}
}
//todo 最后一个分佣提成如果不为空则取其值
$i
=
count
(
$partial_commission
)
-
1
;
if
(
$partial_commission
&&
$partial_commission
[
$i
][
"scale"
]
>
0
)
{
...
...
@@ -1094,7 +1102,6 @@ class OBargainModel extends Model
}
$result
[
$k
][
"last_commission_id"
]
=
$partial_commission
[
$i
][
"id"
];
$result
[
$k
][
'partial_commission'
]
=
$partial_commission
;
$result
[
$k
][
'income_time'
]
=
$m_real
->
field
(
'id,income_time'
)
->
find
(
$v
[
'real_income_id'
]);
}
return
$result
;
}
...
...
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