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
27ab449c
Commit
27ab449c
authored
Jun 13, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
alias
parent
f48042ea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
OfficePayLog.php
application/index/controller/OfficePayLog.php
+6
-6
OfficeOrderModel.php
application/model/OfficeOrderModel.php
+1
-1
No files found.
application/index/controller/OfficePayLog.php
View file @
27ab449c
...
...
@@ -886,6 +886,7 @@ class OfficePayLog extends Basic
* @return \think\Response
*/
public
function
getCollectionDetail
()
{
$this
->
params
[
'pay_id'
]
=
25
;
if
(
empty
(
$this
->
params
[
'pay_id'
]))
{
return
$this
->
response
(
101
,
'参数错误'
);
}
...
...
@@ -911,14 +912,13 @@ class OfficePayLog extends Basic
$bargain_where
[
'id'
]
=
$pay_data
[
'bargain_id'
];
$price
=
$this
->
m_bargain
->
getFieldValue
(
'price'
,
$bargain_where
);
$pay_data
[
'price'
]
=
empty
(
$price
)
?
0
:
$price
;
$m_order
=
new
OfficeOrderModel
();
$house_data
=
$m_order
->
selectOrderByOrderId
(
'b.id,c.address as internal_address,a.f_id'
,
[
'order_id'
=>
$pay_data
[
'order_id'
]]);
$pay_data
[
'house_id'
]
=
empty
(
$house_data
[
0
][
'id'
])
?
''
:
$house_data
[
0
][
'id'
];
$pay_data
[
'address'
]
=
empty
(
$house_data
[
0
][
'internal_address'
])
?
''
:
$house_data
[
0
][
'internal_address'
];
}
$m_order
=
new
OfficeOrderModel
();
$house_data
=
$m_order
->
selectOrderByOrderId
(
'b.id,c.address,a.f_id'
,
[
'order_id'
=>
$pay_data
[
'order_id'
]]);
$pay_data
[
'house_id'
]
=
empty
(
$house_data
[
0
][
'id'
])
?
''
:
$house_data
[
0
][
'id'
];
$pay_data
[
'address'
]
=
empty
(
$house_data
[
0
][
'address'
])
?
''
:
$house_data
[
0
][
'address'
];
$m_pay_adjustment
=
new
OfficeOPayLogAdjustment
();
$source_id
=
$m_pay_adjustment
->
getFieldColumn
(
'id'
,
[
'paylog_id'
=>
$pay_data
[
'id'
]]);
$pay_data
[
'source_id'
]
=
empty
(
$source_id
)
?
0
:
implode
(
','
,
$source_id
);
...
...
application/model/OfficeOrderModel.php
View file @
27ab449c
...
...
@@ -58,7 +58,7 @@ class OfficeOrderModel extends Model
->
field
(
$filed
)
->
alias
(
"a"
)
->
join
(
"office_g_room b"
,
"a.house_id = b.id"
,
"left"
)
->
join
(
"office_g_building c"
,
"
c.id = b.building_
id"
,
"left"
)
->
join
(
"office_g_building c"
,
"
b.building_id = c.
id"
,
"left"
)
->
where
(
$where_
)
->
select
();
//echo $this->db_->getLastSql();
...
...
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