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
9401a0d6
Commit
9401a0d6
authored
Oct 11, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
site_id
parent
7cc3cb60
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
0 deletions
+20
-0
PayLog.php
application/index/controller/PayLog.php
+8
-0
Refund.php
application/index/controller/Refund.php
+12
-0
No files found.
application/index/controller/PayLog.php
View file @
9401a0d6
...
@@ -83,6 +83,11 @@ class PayLog extends Basic
...
@@ -83,6 +83,11 @@ class PayLog extends Basic
if
(
!
empty
(
$this
->
params
[
'order_id'
]))
{
if
(
!
empty
(
$this
->
params
[
'order_id'
]))
{
$where
[
'a.order_id'
]
=
$this
->
params
[
'order_id'
];
$where
[
'a.order_id'
]
=
$this
->
params
[
'order_id'
];
}
}
if
(
!
empty
(
$this
->
params
[
'site_id'
]))
{
$where
[
'e.site_id'
]
=
$this
->
params
[
'site_id'
];
}
$where
[]
=
[
'EXP'
,
'g.id IS NULL AND f.id IS NULL'
];
$where
[]
=
[
'EXP'
,
'g.id IS NULL AND f.id IS NULL'
];
try
{
try
{
$order
=
new
OPayLogModel
();
$order
=
new
OPayLogModel
();
...
@@ -285,6 +290,9 @@ class PayLog extends Basic
...
@@ -285,6 +290,9 @@ class PayLog extends Basic
$where
[
'a.is_del'
]
=
$params
[
'is_del'
];
$where
[
'a.is_del'
]
=
$params
[
'is_del'
];
}
}
if
(
isset
(
$params
[
'site_id'
]))
{
$where
[
'site_id'
]
=
$params
[
'site_id'
];
}
return
$where
;
return
$where
;
}
}
...
...
application/index/controller/Refund.php
View file @
9401a0d6
...
@@ -228,6 +228,10 @@ class Refund extends Basic
...
@@ -228,6 +228,10 @@ class Refund extends Basic
}
}
}
}
if
(
$this
->
params
[
'status'
]
>
0
&&
isset
(
$this
->
params
[
'site_id'
]))
{
$where
[
'c.site_id'
]
=
$this
->
params
[
'site_id'
];
}
if
(
!
empty
(
$this
->
params
[
'start_time'
])
&&
empty
(
$this
->
params
[
'end_time'
]))
{
if
(
!
empty
(
$this
->
params
[
'start_time'
])
&&
empty
(
$this
->
params
[
'end_time'
]))
{
$where
[
'a.create_time'
]
=
[
'>'
,
$this
->
params
[
'start_time'
]
.
' 00:00:00'
];
$where
[
'a.create_time'
]
=
[
'>'
,
$this
->
params
[
'start_time'
]
.
' 00:00:00'
];
}
}
...
@@ -377,9 +381,17 @@ class Refund extends Basic
...
@@ -377,9 +381,17 @@ class Refund extends Basic
$where
[
'a.status'
]
=
[
'in'
,
'0,1'
];
$where
[
'a.status'
]
=
[
'in'
,
'0,1'
];
}
else
{
}
else
{
$where
[
'a.status'
]
=
$this
->
params
[
'status'
];
$where
[
'a.status'
]
=
$this
->
params
[
'status'
];
if
(
$this
->
params
[
'status'
]
==
'0'
)
{
$where
[
'c.site_id'
]
=
$this
->
siteId
;
}
}
}
}
}
if
(
$this
->
params
[
'status'
]
>
0
&&
isset
(
$this
->
params
[
'site_id'
]))
{
$where
[
'c.site_id'
]
=
$this
->
params
[
'site_id'
];
}
if
(
!
empty
(
$this
->
params
[
'start_time'
])
&&
empty
(
$this
->
params
[
'end_time'
]))
{
if
(
!
empty
(
$this
->
params
[
'start_time'
])
&&
empty
(
$this
->
params
[
'end_time'
]))
{
$where
[
'a.create_time'
]
=
[
'>'
,
$this
->
params
[
'start_time'
]
.
' 00:00:00'
];
$where
[
'a.create_time'
]
=
[
'>'
,
$this
->
params
[
'start_time'
]
.
' 00:00:00'
];
}
}
...
...
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