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
eccf104e
Commit
eccf104e
authored
Sep 02, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
where
parent
ad789bbf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
OPayLogModel.php
application/model/OPayLogModel.php
+6
-2
OfficeOPayLogModel.php
application/model/OfficeOPayLogModel.php
+6
-2
No files found.
application/model/OPayLogModel.php
View file @
eccf104e
...
...
@@ -355,7 +355,9 @@ class OPayLogModel extends Model
*/
public
function
getAddPayLogOrderListLimit
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'id desc'
,
$field
=
''
,
$params
=
''
)
{
$params
[
"a.is_del"
]
=
0
;
if
(
!
isset
(
$params
[
"a.is_del"
]))
{
$params
[
"a.is_del"
]
=
0
;
}
return
$this
->
db_
->
field
(
$field
)
->
alias
(
"a"
)
->
join
(
"o_order b"
,
"a.order_id = b.id"
,
"left"
)
...
...
@@ -379,7 +381,9 @@ class OPayLogModel extends Model
*/
public
function
getAddPayLogOrderListLimitTotal
(
$params
=
''
)
{
$params
[
"a.is_del"
]
=
0
;
if
(
!
isset
(
$params
[
"a.is_del"
]))
{
$params
[
"a.is_del"
]
=
0
;
}
return
$this
->
db_
->
alias
(
"a"
)
->
join
(
"o_order b"
,
"a.order_id = b.id"
,
"left"
)
->
join
(
'g_houses d'
,
'b.house_id = d.id'
,
'left'
)
...
...
application/model/OfficeOPayLogModel.php
View file @
eccf104e
...
...
@@ -338,7 +338,9 @@ class OfficeOPayLogModel extends Model
*/
public
function
getAddPayLogOrderListLimit
(
$pageNo
=
1
,
$pageSize
=
15
,
$order_
=
'id desc'
,
$field
=
''
,
$params
=
''
)
{
$params
[
"a.is_del"
]
=
0
;
if
(
!
isset
(
$params
[
"a.is_del"
]))
{
$params
[
"a.is_del"
]
=
0
;
}
return
$this
->
db_
->
field
(
$field
)
->
alias
(
"a"
)
->
join
(
"office_o_order b"
,
"a.order_id = b.id"
,
"left"
)
...
...
@@ -363,7 +365,9 @@ class OfficeOPayLogModel extends Model
*/
public
function
getAddPayLogOrderListLimitTotal
(
$params
=
''
)
{
$params
[
"a.is_del"
]
=
0
;
if
(
!
isset
(
$params
[
"a.is_del"
]))
{
$params
[
"a.is_del"
]
=
0
;
}
return
$this
->
db_
->
alias
(
"a"
)
->
join
(
"office_o_order b"
,
"a.order_id = b.id"
,
"left"
)
->
join
(
'office_g_room d'
,
'b.house_id = d.id'
,
'left'
)
...
...
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