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
0e643432
Commit
0e643432
authored
Dec 18, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
约带看id
parent
2cc18dba
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
Finance.php
application/index/controller/Finance.php
+3
-5
No files found.
application/index/controller/Finance.php
View file @
0e643432
...
...
@@ -3024,19 +3024,17 @@ class Finance extends Basic
$where
[
'b.order_id'
]
=
$this
->
params
[
'march_id'
];
}
$field
=
'a.create_time,a.id,b.order_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id,b.order_id'
;
$field
=
'a.create_time,a.id,b.order_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id,b.order_id
,e.house_id
'
;
$list
=
$m_paylog
->
getAdjustmentListLimit
(
$pageNo
,
$pageSize
,
$order_
=
'a.id desc'
,
$field
,
$where
);
$data
[
'total'
]
=
$m_paylog
->
getAdjustmentListTotal
(
$where
);
$m_agent
=
new
AAgents
();
$m_house
=
new
GHouses
();
$m_order
=
new
OrderModel
();
foreach
(
$list
as
$k
=>
$v
)
{
$list
[
$k
][
'name'
]
=
$m_agent
->
getAgentsById
(
$v
[
'operation_id'
],
'name'
);
$house_id
=
$m_order
->
getFieldValue
(
'house_id'
,
[
'id'
=>
$v
[
'order_id'
]]);
if
(
$house_id
)
{
$house_data
=
$m_house
->
getHouseDetail
(
'id,internal_address'
,
[
'id'
=>
$house_id
]);
if
(
$v
[
'house_id'
])
{
$house_data
=
$m_house
->
getHouseDetail
(
'id,internal_address'
,
[
'id'
=>
$v
[
'house_id'
]]);
$list
[
$k
][
'house_id'
]
=
$house_data
[
'id'
];
$list
[
$k
][
'address'
]
=
$house_data
[
'internal_address'
];
}
else
{
...
...
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