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
1bdf5667
Commit
1bdf5667
authored
Aug 22, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
00cddc64
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
User.php
application/api_broker/controller/User.php
+5
-4
UserGetLastOrNextUserIdPhoneFollowPuValidate.php
...validate/UserGetLastOrNextUserIdPhoneFollowPuValidate.php
+1
-1
No files found.
application/api_broker/controller/User.php
View file @
1bdf5667
...
@@ -617,10 +617,10 @@ class User extends Basic
...
@@ -617,10 +617,10 @@ class User extends Basic
}
}
// 判断当天被拨打是否超过5次
// 判断当天被拨打是否超过5次
$clientService
=
new
ClientService
();
//
$clientService = new ClientService();
if
(
!
$clientService
->
dialTotal
(
$model_res
[
0
][
'user_id'
]))
{
//
if (!$clientService->dialTotal($model_res[0]['user_id'])) {
return
$this
->
response
(
"201"
,
"当天被拨打超过5次"
,
[
'user_id'
=>
$model_res
[
0
][
'id'
]]);
//
return $this->response("201", "当天被拨打超过5次", ['user_id'=>$model_res[0]['id']]);
}
//
}
//如果非客方
//如果非客方
if
(
$model_res
[
0
][
'agent_id'
]
!=
$params
[
'agent_id'
]){
if
(
$model_res
[
0
][
'agent_id'
]
!=
$params
[
'agent_id'
]){
...
@@ -649,6 +649,7 @@ class User extends Basic
...
@@ -649,6 +649,7 @@ class User extends Basic
$max_id
=
$model
->
getLastOrNextUserIDPhoneFollowP
(
$where
,
$field
,
$limit
=
''
,
$order
);
$max_id
=
$model
->
getLastOrNextUserIDPhoneFollowP
(
$where
,
$field
,
$limit
=
''
,
$order
);
$field
=
'MIN(a.id) as min_id'
;
$field
=
'MIN(a.id) as min_id'
;
$min_id
=
$model
->
getLastOrNextUserIDPhoneFollowP
(
$where
,
$field
,
$limit
=
''
,
$order
);
$min_id
=
$model
->
getLastOrNextUserIDPhoneFollowP
(
$where
,
$field
,
$limit
=
''
,
$order
);
//dump($model_res);exit();
return
$this
->
response
(
"200"
,
"success!"
,
[
return
$this
->
response
(
"200"
,
"success!"
,
[
'id'
=>
$model_res
[
0
][
'id'
],
'id'
=>
$model_res
[
0
][
'id'
],
'user_id'
=>
$model_res
[
0
][
'user_id'
],
'user_id'
=>
$model_res
[
0
][
'user_id'
],
...
...
application/api_broker/validate/UserGetLastOrNextUserIdPhoneFollowPuValidate.php
View file @
1bdf5667
...
@@ -8,7 +8,7 @@ use think\Validate;
...
@@ -8,7 +8,7 @@ use think\Validate;
* Date: 2018/8/7
* Date: 2018/8/7
* Time: 13:54:12
* Time: 13:54:12
*/
*/
class
UserGetLastOrNextUserIdValidate
extends
Validate
{
class
UserGetLastOrNextUserId
PhoneFollowPu
Validate
extends
Validate
{
protected
$rule
=
[
protected
$rule
=
[
'type'
=>
'require'
,
'type'
=>
'require'
,
'agent_id'
=>
'require|number|gt:0'
,
'agent_id'
=>
'require|number|gt:0'
,
...
...
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