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
1e2c7d90
Commit
1e2c7d90
authored
Aug 07, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
办公楼退款楼盘地址
parent
b2e0da38
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
OfficePayLog.php
application/api_broker/controller/OfficePayLog.php
+3
-3
OfficeOrderModel.php
application/model/OfficeOrderModel.php
+3
-1
No files found.
application/api_broker/controller/OfficePayLog.php
View file @
1e2c7d90
...
...
@@ -215,10 +215,10 @@ class OfficePayLog extends Basic
foreach
(
$refund_data
as
$k
=>
$v
)
{
$refund_data
[
$k
][
'pay_create_time'
]
=
$m_pay
->
getFieldValue
(
'create_time'
,
[
'id'
=>
$v
[
'pay_log_id'
]]);
$house_data
=
$m_order
->
getHouseInfoByOrderIdOne
(
'
a.house_id,b.internal_
address'
,
[
'a.id'
=>
$v
[
'order_id'
]]);
$house_data
=
$m_order
->
getHouseInfoByOrderIdOne
(
'
c.id,d.
address'
,
[
'a.id'
=>
$v
[
'order_id'
]]);
if
(
$house_data
)
{
$refund_data
[
$k
][
'house_id'
]
=
$house_data
[
'
house_
id'
];
$refund_data
[
$k
][
'house_address'
]
=
$house_data
[
'
internal_
address'
];
$refund_data
[
$k
][
'house_id'
]
=
$house_data
[
'id'
];
$refund_data
[
$k
][
'house_address'
]
=
$house_data
[
'address'
];
}
else
{
$refund_data
[
$k
][
'house_id'
]
=
0
;
$refund_data
[
$k
][
'house_address'
]
=
''
;
...
...
application/model/OfficeOrderModel.php
View file @
1e2c7d90
...
...
@@ -276,7 +276,9 @@ class OfficeOrderModel extends Model
return
$this
->
db_
->
field
(
$field
)
->
alias
(
"a"
)
->
join
(
"g_houses b"
,
"a.house_id = b.id"
,
"left"
)
->
join
(
"office_o_report b"
,
"a.f_id = b.id"
,
"left"
)
->
join
(
"office_g_room c"
,
"a.house_id = c.id"
,
"left"
)
->
join
(
"office_g_building d"
,
"c.building_id = d.id"
,
"left"
)
->
where
(
$params
)
->
find
();
}
...
...
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