Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
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
bp
ShenghuoquanBusiness
Commits
efa6bd75
Commit
efa6bd75
authored
Jul 13, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update 管理中心 企业员工隐藏其他服务-认证管理
parent
93230824
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
12 deletions
+25
-12
Constant.kt
.../com/yidian/shenghuoquan/newscontent/constant/Constant.kt
+3
-0
MerchantCenterActivity.kt
...nghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
+22
-12
No files found.
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/constant/Constant.kt
View file @
efa6bd75
...
...
@@ -93,6 +93,9 @@ object Constant {
const
val
MERCHANT_SERVICE_GROUP_MANAGEMENT
=
2
// 管理服务
const
val
MERCHANT_SERVICE_GROUP_OTHER
=
3
// 其他服务
// 商户管理中心服务功能id
const
val
MERCHANT_SERVICE_FUNCTION_AUTH_MANAGEMENT
=
305
// 其他服务-认证管理
// 各输入场景最大长度显示
const
val
MAX_LENGTH_LIFE_ACCOUNT_NAME
=
24
// 生活号名称
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
View file @
efa6bd75
...
...
@@ -305,25 +305,35 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
/**
* 过滤商户服务数据
* 目前处理个人认证状态下和企业员工角色下不展示管理服务
* 目前处理 1.个人认证状态下和企业员工角色下不展示管理服务
* 2.企业员工角色下不展示其他服务-认证管理
*/
private
fun
filterMerchantServiceData
(
data
:
List
<
GetCommonConfigBean
.
Item
>)
{
val
result
=
ArrayList
<
GetCommonConfigBean
.
Item
>(
data
.
size
)
data
.
let
{
(
it
as
ArrayList
<
GetCommonConfigBean
.
Item
>).
iterator
().
apply
{
(
data
as
ArrayList
<
GetCommonConfigBean
.
Item
>).
iterator
().
apply
{
while
(
hasNext
())
{
val
group
=
next
()
if
(
group
.
groupId
==
Constant
.
MERCHANT_SERVICE_GROUP_MANAGEMENT
)
{
// 个人认证或企业员工不展示管理服务
if
(
getCurLifeAccountLabel
()
==
Constant
.
LIFE_ACCOUNT_TAG_PERSONAL_AUTH
||
curLifeAccount
.
role_type
==
Constant
.
TYPE_ROLE_ORDINARY
)
{
continue
remove
()
}
}
if
(
group
.
groupId
==
Constant
.
MERCHANT_SERVICE_GROUP_OTHER
)
{
// 企业员工不展示其他服务-认证管理
if
(
curLifeAccount
.
role_type
==
Constant
.
TYPE_ROLE_ORDINARY
)
{
(
group
.
functions
as
ArrayList
<
GetCommonConfigBean
.
Function
>).
iterator
().
apply
{
while
(
hasNext
())
{
val
function
=
next
()
if
(
function
.
functionId
==
Constant
.
MERCHANT_SERVICE_FUNCTION_AUTH_MANAGEMENT
)
{
remove
()
}
}
}
}
result
.
add
(
group
)
}
}
}
(
viewBind
.
rvServiceGroup
.
adapter
as
MerchantServiceGroupAdapter
).
updateData
(
result
)
(
viewBind
.
rvServiceGroup
.
adapter
as
MerchantServiceGroupAdapter
).
updateData
(
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