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
7ad42ba3
Commit
7ad42ba3
authored
Feb 18, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
list_3
parent
28e74c55
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
Finance.php
application/index/controller/Finance.php
+12
-0
No files found.
application/index/controller/Finance.php
View file @
7ad42ba3
...
...
@@ -4027,6 +4027,7 @@ class Finance extends Basic
$m_agent_house
=
new
GHousesToAgents
();
$m_house
=
new
GHouses
();
$m_refund
=
new
ORefundModel
();
$m_agent
=
new
AAgents
();
foreach
(
$list
as
$k
=>
$v
)
{
if
(
$v
[
'source'
]
==
2
)
{
$source_id
=
$m_pay_adjustment
->
getFieldColumn
(
'id'
,
[
'new_paylog_id'
=>
$v
[
'id'
]]);
...
...
@@ -4096,6 +4097,17 @@ class Finance extends Basic
$m_paylog_adjustment
=
new
OPayLogAdjustment
();
$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_2
=
$m_paylog_adjustment
->
getAdjustmentListLimit
(
1
,
1000
,
''
,
$field
,
$where_2
);
foreach
(
$list_2
as
$k
=>
$v
)
{
$list_2
[
$k
][
'name'
]
=
$m_agent
->
getAgentsById
(
$v
[
'operation_id'
],
'name'
);
if
(
$v
[
'house_id'
])
{
$house_data
=
$m_house
->
getHouseDetail
(
'id,internal_address'
,
[
'id'
=>
$v
[
'house_id'
]]);
$list_2
[
$k
][
'house_id'
]
=
$house_data
[
'id'
];
$list_2
[
$k
][
'address'
]
=
$house_data
[
'internal_address'
];
}
else
{
$list_2
[
$k
][
'house_id'
]
=
''
;
$list_2
[
$k
][
'address'
]
=
''
;
}
}
$fields
=
'a.create_time,a.id,a.order_id,a.pay_log_id,a.refund_money,a.type,a.agent_id,a.agent_name,b.house_id,a.status,'
;
$fields
.=
'd.income_time,a.type,c.store_id'
;
...
...
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