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
247f5dd7
Commit
247f5dd7
authored
Jul 15, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
0bc65be9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
38 additions
and
16 deletions
+38
-16
User.php
application/api_broker/controller/User.php
+0
-0
StatementService.php
application/api_broker/service/StatementService.php
+1
-1
OfficeFinance.php
application/index/controller/OfficeFinance.php
+1
-1
UserLogService.php
application/index/service/UserLogService.php
+23
-11
UserSiteService.php
application/index/service/UserSiteService.php
+1
-1
OPartialCommission.php
application/model/OPartialCommission.php
+1
-1
OfficeOPartialCommission.php
application/model/OfficeOPartialCommission.php
+1
-1
UserSiteModel.php
application/model/UserSiteModel.php
+10
-0
No files found.
application/api_broker/controller/User.php
View file @
247f5dd7
This diff is collapsed.
Click to expand it.
application/api_broker/service/StatementService.php
View file @
247f5dd7
...
...
@@ -814,7 +814,7 @@ class StatementService
public
function
selectStatementForDistrictWithDay
(
$agent_level
,
$district_id
)
{
$agent_res
=
$this
->
getAgentIDsByDistrictId
(
$district_id
,
$agent_level
,
0
);
big_log
(
$agent_res
);
//
big_log($agent_res);
$conditions
[
'agent_id'
]
=
array
(
"in"
,
$agent_res
[
'agent_ids'
]
);
...
...
application/index/controller/OfficeFinance.php
View file @
247f5dd7
...
...
@@ -120,7 +120,7 @@ class OfficeFinance extends Basic
$select
=
1
;
}
big_log
(
$where
);
//
big_log($where);
$field
=
'a.id,b.id as bargain_id,f.income_time,a.practical_fee,b.scale_fee,s.address as internal_address,
b.agent_id,b.house_number,b.father_id,b.order_id,a.real_income_id,a.role,b.scale'
;
$m_Office_commission
=
new
OfficeOPartialCommission
();
...
...
application/index/service/UserLogService.php
View file @
247f5dd7
...
...
@@ -116,7 +116,8 @@ class UserLogService
$data
[
'site_ids_name_new'
]
=
$s_user_site
->
getSiteNameList
(
$user_id
);
#拨打电话按钮是否显示 0:显示 1:不显示
$data
[
'is_phone_button_show'
]
=
$this
->
isPhoneButtonShow
(
$user_id
,
$agent_id
,
$user_arr
[
'vip'
]);
$data
[
'is_phone_button_show'
]
=
$this
->
isPhoneButtonShow
(
$user_id
,
$agent_id
,
$user_arr
[
'vip'
],
$user_arr
[
'user_phone'
],
$user_arr
[
'agent_id'
]);
//客方
$s_user_agent
=
new
UserAgentService
();
...
...
@@ -266,8 +267,7 @@ class UserLogService
$result
[
"is_outstrip_twenty_four_hours"
]
=
$user_service
->
isUserProtect
(
$user_id
);
#拨打电话按钮是否显示 0:显示 1:不显示
$result
[
'is_phone_button_show'
]
=
$this
->
isPhoneButtonShow
(
$user_id
,
$agent_id
,
$result
[
'vip'
]);
$result
[
'is_phone_button_show'
]
=
$this
->
isPhoneButtonShow
(
$user_id
,
$agent_id
,
$result
[
'vip'
],
$result
[
'user_phone'
],
$result
[
'agent_id'
]);
#编辑客户详情权限 0:有权限 1:无权限
$result
[
'is_can_edit_user_info'
]
=
$user_service
->
isCanEditUserInfo
(
$result
[
"agent_id"
],
$agent_id
);
...
...
@@ -331,33 +331,43 @@ class UserLogService
* @param $user_id
* @param $agent_id
* @param $is_vip
* @param $result_user_phone
* @param $result_agent_id
* @return int
*/
public
function
isPhoneButtonShow
(
$user_id
,
$agent_id
,
$is_vip
)
public
function
isPhoneButtonShow
(
$user_id
,
$agent_id
,
$is_vip
,
$result_user_phone
,
$result_agent_id
)
{
$user_service
=
new
UserService
();
$vip_services
=
new
VipService
();
$s_user_agent
=
new
UserAgentService
();
$user_agent_list
=
$s_user_agent
->
getUserAgentId
(
$user_id
);
$is_user_agent_boss
=
1
;
$called
=
1
;
$user_agent_list_arr
=
[];
if
(
$user_agent_list
){
if
(
$user_agent_list
)
{
$is_user_agent_boss
=
1
;
$called
=
1
;
$user_agent_list_arr
=
[];
foreach
(
$user_agent_list
as
$key
=>
$value
)
{
$user_agent_list_arr
[]
=
$value
[
'agent_id'
];
#查询当前经纪人是否是某个客方的总监 0:可查看 1:不可查看
$agent_boss_res
=
$user_service
->
isUserAgentDirector
(
$value
[
'agent_id'
],
$agent_id
);
if
(
$agent_boss_res
==
0
)
if
(
$agent_boss_res
==
0
)
$is_user_agent_boss
=
0
;
#是否有绑定关系 0有 1无
$called_res
=
$this
->
userDetailIsOutpaceCallNumPhone
(
$value
[
'phone'
],
$agent_id
);
if
(
$called_res
==
0
)
if
(
$called_res
==
0
)
$called
=
0
;
}
}
#查询当前经纪人是否是某个客方的总监 0:可查看 1:不可查看
$is_user_agent_boss_v2
=
$user_service
->
isUserAgentDirector
(
$result_agent_id
,
$agent_id
);
if
(
$is_user_agent_boss_v2
==
0
)
$is_user_agent_boss
=
0
;
#是否有绑定关系 0有 1无
$called_v2
=
$this
->
userDetailIsOutpaceCallNumPhone
(
$result_user_phone
,
$agent_id
);
if
(
$called_v2
==
0
)
$called
=
0
;
#判断当天被拨打是否超过5次 (0:拨打不超过5次 1:超过5次)
$is_outpace_call_num
=
$this
->
userDetailIsOutpaceCallNum5
(
$user_id
);
...
...
@@ -378,6 +388,8 @@ class UserLogService
OR
in_array
(
$agent_id
,
$user_agent_list_arr
)
//客方可以看
OR
(
$result_agent_id
==
$agent_id
)
//客方可以看
OR
((
$is_vip
==
1
)
and
(
$examine_vip
==
0
))
OR
((
$is_outpace_call_num
==
0
)
and
(
$is_outstrip_twenty_four_hours
==
0
)
and
((
$is_user_agent_boss
==
0
)
or
(
in_array
(
$agent_id
,
$user_agent_list_arr
))
or
(
$called
==
0
)))
...
...
application/index/service/UserSiteService.php
View file @
247f5dd7
...
...
@@ -83,7 +83,7 @@ class UserSiteService
for
(
$page
=
1
;
$page
<=
$total_page
;
$page
++
)
{
$res
=
$this
->
moveUserSiteSaveData
(
$page
,
$limit
);
big_log
(
$res
);
//
big_log($res);
}
return
''
;
}
...
...
application/model/OPartialCommission.php
View file @
247f5dd7
...
...
@@ -42,7 +42,7 @@ class OPartialCommission extends BaseModel
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
->
select
();
big_log
(
$this
->
getLastSql
());
//
big_log($this->getLastSql());
$m_agent
=
new
AAgents
();
$fields_str
=
'a.id,a.name,a.phone,b.store_name'
;
foreach
(
$data
as
$k
=>
$v
)
{
...
...
application/model/OfficeOPartialCommission.php
View file @
247f5dd7
...
...
@@ -43,7 +43,7 @@ class OfficeOPartialCommission extends BaseModel
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
->
select
();
big_log
(
$this
->
getLastSql
());
//
big_log($this->getLastSql());
$m_agent
=
new
AAgents
();
$fields_str
=
'a.id,a.name,a.phone,b.store_name'
;
foreach
(
$data
as
$k
=>
$v
)
{
...
...
application/model/UserSiteModel.php
View file @
247f5dd7
...
...
@@ -50,6 +50,16 @@ class UserSiteModel extends Model
return
$result
;
}
public
function
selectUserSite
(
$field
,
$params
)
{
$result
=
$this
->
db_
->
field
(
$field
)
->
where
(
$params
)
->
select
();
//echo $this->getLastSql();
return
$result
;
}
/**
* 更新数据
*/
...
...
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