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
de0e66cb
Commit
de0e66cb
authored
Nov 08, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
1c396d89
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
CallPhoneService.php
application/api_broker/service/CallPhoneService.php
+2
-2
BindingPhone.php
application/model/BindingPhone.php
+3
-2
No files found.
application/api_broker/service/CallPhoneService.php
View file @
de0e66cb
...
@@ -389,7 +389,7 @@ class CallPhoneService
...
@@ -389,7 +389,7 @@ class CallPhoneService
$where
[
'a.status'
]
=
1
;
$where
[
'a.status'
]
=
1
;
$where
[
'a.phone_a'
]
=
$this
->
phone_a
;
$where
[
'a.phone_a'
]
=
$this
->
phone_a
;
$where
[
'a.type'
]
=
$this
->
is_privacy
;
$where
[
'a.type'
]
=
$this
->
is_privacy
;
$agent_call
=
$this
->
m_bind
->
getPhoneX
(
'a.phone_a,a.phone_b,b.phone_x'
,
$where
);
$agent_call
=
$this
->
m_bind
->
getPhoneX
(
'a.phone_a,a.phone_b,b.phone_x'
,
$where
,
'a.id ASC'
);
$result_unbind
=
$this
->
agentsUnBindRedis
(
$agent_call
[
'phone_a'
],
$agent_call
[
'phone_b'
],
$agent_call
[
'phone_x'
]);
$result_unbind
=
$this
->
agentsUnBindRedis
(
$agent_call
[
'phone_a'
],
$agent_call
[
'phone_b'
],
$agent_call
[
'phone_x'
]);
$data
[
'msg'
]
=
'号码使用完,请联系运营人员。'
;
$data
[
'msg'
]
=
'号码使用完,请联系运营人员。'
;
if
(
$result_unbind
[
'status'
]
==
'successful'
)
{
if
(
$result_unbind
[
'status'
]
==
'successful'
)
{
...
@@ -459,7 +459,7 @@ class CallPhoneService
...
@@ -459,7 +459,7 @@ class CallPhoneService
$where
[
'a.status'
]
=
1
;
$where
[
'a.status'
]
=
1
;
$where
[
'a.phone_a'
]
=
$this
->
phone_a
;
$where
[
'a.phone_a'
]
=
$this
->
phone_a
;
$where
[
'a.type'
]
=
$this
->
is_privacy
;
$where
[
'a.type'
]
=
$this
->
is_privacy
;
$agent_call
=
$this
->
m_bind
->
getPhoneX
(
'a.phone_a,a.phone_b,b.phone_x'
,
$where
);
$agent_call
=
$this
->
m_bind
->
getPhoneX
(
'a.phone_a,a.phone_b,b.phone_x'
,
$where
,
'a.id ASC'
);
$result_unbind
=
$this
->
agentsUnBindRedis
(
$agent_call
[
'phone_a'
],
$agent_call
[
'phone_b'
],
$agent_call
[
'phone_x'
]);
$result_unbind
=
$this
->
agentsUnBindRedis
(
$agent_call
[
'phone_a'
],
$agent_call
[
'phone_b'
],
$agent_call
[
'phone_x'
]);
if
(
$result_unbind
[
'status'
]
==
'successful'
)
{
if
(
$result_unbind
[
'status'
]
==
'successful'
)
{
$result
=
$yun_tong_xun
->
setNumber
(
$this
->
phone_a
,
$this
->
phone_b
,
$area
,
$this
->
expiry_date
,
$record
);
$result
=
$yun_tong_xun
->
setNumber
(
$this
->
phone_a
,
$this
->
phone_b
,
$area
,
$this
->
expiry_date
,
$record
);
...
...
application/model/BindingPhone.php
View file @
de0e66cb
...
@@ -92,18 +92,19 @@ class BindingPhone extends BaseModel
...
@@ -92,18 +92,19 @@ class BindingPhone extends BaseModel
*
*
* @param string $field
* @param string $field
* @param array $where
* @param array $where
* @param string $order
* @return array|false|\PDOStatement|string|\think\Model
* @return array|false|\PDOStatement|string|\think\Model
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\DbException
*/
*/
public
function
getPhoneX
(
$field
=
''
,
$where
=
[])
public
function
getPhoneX
(
$field
=
''
,
$where
=
[]
,
$order
=
'a.id desc'
)
{
{
return
$this
->
alias
(
'a'
)
return
$this
->
alias
(
'a'
)
->
field
(
$field
)
->
field
(
$field
)
->
join
(
'aliYun_phone b'
,
'a.aliYun_phone_id=b.id'
,
'left'
)
->
join
(
'aliYun_phone b'
,
'a.aliYun_phone_id=b.id'
,
'left'
)
->
where
(
$where
)
->
where
(
$where
)
->
order
(
'a.id desc'
)
->
order
(
$order
)
->
find
();
->
find
();
}
}
...
...
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