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
0812d4d4
Commit
0812d4d4
authored
Apr 19, 2019
by
clone
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '0416-v3.2.5' of
https://gitee.com/zwyjjc/tl_estate
into 0416-v3.2.5
parents
a69e5d0d
e8dd45a3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
CallPhoneService.php
application/api_broker/service/CallPhoneService.php
+13
-3
Bargain.php
application/index/controller/Bargain.php
+0
-1
No files found.
application/api_broker/service/CallPhoneService.php
View file @
0812d4d4
...
@@ -86,7 +86,7 @@ class CallPhoneService
...
@@ -86,7 +86,7 @@ class CallPhoneService
if
(
!
empty
(
$user_id
))
{
if
(
!
empty
(
$user_id
))
{
$this
->
user_id
=
$user_id
;
$this
->
user_id
=
$user_id
;
$user_data
=
$this
->
getUserData
();
$user_data
=
$this
->
getUserData
V2
();
if
(
empty
(
$user_data
[
'user_phone'
]))
{
if
(
empty
(
$user_data
[
'user_phone'
]))
{
$result
[
'status'
]
=
'fail'
;
$result
[
'status'
]
=
'fail'
;
$result
[
'msg'
]
=
'没有用户信息'
;
$result
[
'msg'
]
=
'没有用户信息'
;
...
@@ -250,7 +250,7 @@ class CallPhoneService
...
@@ -250,7 +250,7 @@ class CallPhoneService
if
(
empty
(
$phone_b
))
{
if
(
empty
(
$phone_b
))
{
if
(
!
empty
(
$user_id
))
{
if
(
!
empty
(
$user_id
))
{
$this
->
user_id
=
$user_id
;
$this
->
user_id
=
$user_id
;
$user_data
=
$this
->
getUserData
();
$user_data
=
$this
->
getUserData
V2
();
if
(
empty
(
$user_data
[
'user_phone'
]))
{
if
(
empty
(
$user_data
[
'user_phone'
]))
{
$data
[
'status'
]
=
'failed'
;
$data
[
'status'
]
=
'failed'
;
$data
[
'msg'
]
=
'没有客户信息,可以忽略。'
;
$data
[
'msg'
]
=
'没有客户信息,可以忽略。'
;
...
@@ -345,7 +345,7 @@ class CallPhoneService
...
@@ -345,7 +345,7 @@ class CallPhoneService
if
(
empty
(
$phone_b
))
{
if
(
empty
(
$phone_b
))
{
if
(
!
empty
(
$user_id
))
{
if
(
!
empty
(
$user_id
))
{
$this
->
user_id
=
$user_id
;
$this
->
user_id
=
$user_id
;
$user_data
=
$this
->
getUserData
();
$user_data
=
$this
->
getUserData
V2
();
if
(
empty
(
$user_data
[
'user_phone'
]))
{
if
(
empty
(
$user_data
[
'user_phone'
]))
{
$data
[
'status'
]
=
'fail'
;
$data
[
'status'
]
=
'fail'
;
$data
[
'msg'
]
=
'没有客户信息,可以忽略。'
;
$data
[
'msg'
]
=
'没有客户信息,可以忽略。'
;
...
@@ -552,6 +552,16 @@ class CallPhoneService
...
@@ -552,6 +552,16 @@ class CallPhoneService
return
$data
;
return
$data
;
}
}
/**
* @return array|bool|false|mixed|\PDOStatement|string|\think\Model
*/
public
function
getUserDataV2
()
{
$redis_cache
=
new
RedisCacheService
();
$data
=
$redis_cache
->
getRedisCache
(
1
,
$this
->
user_id
);
return
$data
;
}
/**
/**
* 查询经纪人与客户绑定数量
* 查询经纪人与客户绑定数量
*
*
...
...
application/index/controller/Bargain.php
View file @
0812d4d4
...
@@ -30,7 +30,6 @@ class Bargain extends Basic
...
@@ -30,7 +30,6 @@ class Bargain extends Basic
public
function
bargainListSearchBargainId
()
public
function
bargainListSearchBargainId
()
{
{
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/* $params = array(
/* $params = array(
"submit_agent_id" => 93,
"submit_agent_id" => 93,
"status" => 1,//0全部 1未结单 2已结单 3 撤销审核 4已撤销
"status" => 1,//0全部 1未结单 2已结单 3 撤销审核 4已撤销
...
...
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