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
f0aed09d
Commit
f0aed09d
authored
Sep 19, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
成交报告-分佣提成列表-显示绑定的实收日期
parent
833032c7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
OBargainModel.php
application/model/OBargainModel.php
+2
-0
No files found.
application/model/OBargainModel.php
View file @
f0aed09d
...
@@ -1042,6 +1042,7 @@ class OBargainModel extends Model
...
@@ -1042,6 +1042,7 @@ class OBargainModel extends Model
$m_agent
=
new
AAgents
();
$m_agent
=
new
AAgents
();
$m_partial
=
new
OPartialCommission
();
$m_partial
=
new
OPartialCommission
();
$m_real
=
new
ORealIncome
();
$fields_str
=
'a.id,a.name,a.phone,b.store_name,c.district_name'
;
$fields_str
=
'a.id,a.name,a.phone,b.store_name,c.district_name'
;
foreach
(
$data
as
$k
=>
$v
)
{
foreach
(
$data
as
$k
=>
$v
)
{
$result
[
$k
]
=
$v
;
$result
[
$k
]
=
$v
;
...
@@ -1093,6 +1094,7 @@ class OBargainModel extends Model
...
@@ -1093,6 +1094,7 @@ class OBargainModel extends Model
}
}
$result
[
$k
][
"last_commission_id"
]
=
$partial_commission
[
$i
][
"id"
];
$result
[
$k
][
"last_commission_id"
]
=
$partial_commission
[
$i
][
"id"
];
$result
[
$k
][
'partial_commission'
]
=
$partial_commission
;
$result
[
$k
][
'partial_commission'
]
=
$partial_commission
;
$result
[
$k
][
'income_time'
]
=
$m_real
->
field
(
'id,income_time'
)
->
find
(
$v
[
'real_income_id'
]);
}
}
return
$result
;
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