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
44316a0b
Commit
44316a0b
authored
Jun 30, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
address
parent
2f33d47a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
OfficePayLog.php
application/index/controller/OfficePayLog.php
+3
-4
No files found.
application/index/controller/OfficePayLog.php
View file @
44316a0b
...
...
@@ -1456,7 +1456,6 @@ class OfficePayLog extends Basic
$m_agent
=
new
AAgents
();
$m_paylog
=
new
officeOPayLogModel
();
$m_room
=
new
OfficeGRoom
();
$m_building
=
new
OfficeGBuilding
();
$field
=
'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,'
;
$field
.=
'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_number,a.is_dividend,a.last_transfer_time,a.industry_type,a.agent_id,g.address,e.name as agent_name'
;
...
...
@@ -1500,7 +1499,6 @@ class OfficePayLog extends Basic
}
else
{
$list
[
$k
][
'bargain_id'
]
=
''
;
}
die
(
'111'
);
$list
[
$k
][
'current_agent_name'
]
=
$list
[
$k
][
'store_name'
]
=
""
;
if
(
$v
[
'type'
]
==
92
)
{
$is_exclusive_type
=
$m_room
->
getFieldOneValue
(
'is_exclusive_type'
,
[
'id'
=>
$v
[
'house_id'
]]);
...
...
@@ -1546,7 +1544,7 @@ class OfficePayLog extends Basic
foreach
(
$list_2
as
$k
=>
$v
)
{
$list_2
[
$k
][
'name'
]
=
$m_agent
->
getAgentsById
(
$v
[
'operation_id'
],
'name'
);
if
(
$v
[
'house_id'
])
{
$house_data
=
$m_
building
->
getFindData
(
'id,address'
,
[
'
id'
=>
$v
[
'house_id'
]]);
$house_data
=
$m_
room
->
getHouseDetail
(
'a.id,b.address'
,
[
'a.
id'
=>
$v
[
'house_id'
]]);
$list_2
[
$k
][
'house_id'
]
=
$house_data
[
'id'
];
$list_2
[
$k
][
'address'
]
=
$house_data
[
'address'
];
}
else
{
...
...
@@ -1562,7 +1560,8 @@ class OfficePayLog extends Basic
if
(
empty
(
$v
[
'house_id'
]))
{
$list_3
[
$k
][
'address'
]
=
''
;
}
else
{
$list_3
[
$k
][
'address'
]
=
$m_building
->
getFieldOneValue
(
'address'
,
[
'id'
=>
$v
[
'house_id'
]]);
$house_data
=
$m_room
->
getHouseDetail
(
'b.address'
,
[
'a.id'
=>
$v
[
'house_id'
]]);
$list_3
[
$k
][
'address'
]
=
$house_data
[
'address'
];
}
if
(
empty
(
$v
[
'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