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
c241c3ed
Commit
c241c3ed
authored
Aug 10, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
f7f76a18
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
User.php
application/api_broker/controller/User.php
+2
-1
No files found.
application/api_broker/controller/User.php
View file @
c241c3ed
...
...
@@ -131,7 +131,7 @@ class User extends Basic
$start_time
=
date
(
'Y-m-d H:i:s'
,
$params
[
'start_time'
]);
$end_time
=
date
(
'Y-m-d H:i:s'
,
$params
[
'end_time'
]);
$conditions
[
'create_time'
]
=
array
(
'between'
,
array
(
$start_time
,
$end_time
)
);
}
else
if
(
empty
(
$params
[
"agent_id"
])
&&
empty
(
$params
[
"id"
])
&&
empty
(
$params
[
"user_phone"
]))
{
}
else
if
(
empty
(
$params
[
"agent_id"
])
&&
empty
(
$params
[
"id"
])
&&
empty
(
$params
[
"user_phone"
]))
{
$time_
=
date
(
'Y-m-d H:i:s'
,
strtotime
(
"-1 day"
));
$conditions
[
'create_time'
]
=
array
(
'lt'
,
$time_
);
}
...
...
@@ -166,6 +166,7 @@ class User extends Basic
$vip_services
=
new
VipService
();
$data
[
'examine_vip'
]
=
$vip_services
->
vip
(
$this
->
agentId
);
$data
[
'user_date'
]
=
$list
;
$data
[
'total_page'
]
=
count
(
$userList
);
return
$this
->
response
(
"200"
,
'request success'
,
$data
);
}
...
...
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