Commit 447a7317 authored by yinjiacheng's avatar yinjiacheng

fix SHQBD-232 暂时由客户端判断生活号标签

parent 6fa06455
...@@ -35,6 +35,7 @@ object Constant { ...@@ -35,6 +35,7 @@ object Constant {
const val TYPE_LIFE_ACCOUNT_ENTERPRISE = 2 // 企业生活号 const val TYPE_LIFE_ACCOUNT_ENTERPRISE = 2 // 企业生活号
// 生活号Tag // 生活号Tag
const val LIFE_ACCOUNT_TAG_ENTERPRISE_AUTH = 0 // 企业认证
const val LIFE_ACCOUNT_TAG_COMMON_ENTERPRISE_AUTH = 1 // 普通企业认证 const val LIFE_ACCOUNT_TAG_COMMON_ENTERPRISE_AUTH = 1 // 普通企业认证
const val LIFE_ACCOUNT_TAG_INDIVIDUAL_BUSINESS_AUTH = 2 // 个体工商户认证 const val LIFE_ACCOUNT_TAG_INDIVIDUAL_BUSINESS_AUTH = 2 // 个体工商户认证
const val LIFE_ACCOUNT_TAG_PERSONAL_AUTH = 3 // 个人认证 const val LIFE_ACCOUNT_TAG_PERSONAL_AUTH = 3 // 个人认证
......
...@@ -72,6 +72,10 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), ...@@ -72,6 +72,10 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
* 功能-页面表 * 功能-页面表
*/ */
private val functionPageMap by lazy { HashMap<Int, String?>() } private val functionPageMap by lazy { HashMap<Int, String?>() }
/**
* 当前生活号状态下功能集
*/
private val functionPermissionList by lazy { ArrayList<Int>() } private val functionPermissionList by lazy { ArrayList<Int>() }
override fun createViewBinding(): ActivityMerchantCenterBinding { override fun createViewBinding(): ActivityMerchantCenterBinding {
...@@ -138,9 +142,9 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), ...@@ -138,9 +142,9 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
viewBind.lvLifeAccountLabel.setLifeAccountData(data) viewBind.lvLifeAccountLabel.setLifeAccountData(data)
// 展示底部浮窗 // 展示底部浮窗
showMerchantCenterBottomHint(data) showMerchantCenterBottomHint(data)
// 生成当前生活号状态下的功能集 // 生活号状态变更 生成当前生活号状态下的功能集
generateFunctionPermissionMap(curConfigData) generateFunctionPermissionMap(curConfigData)
// 过滤商户服务数据 // 生活号状态变更 过滤商户服务数据
filterMerchantServiceData(curConfigData) filterMerchantServiceData(curConfigData)
} }
...@@ -199,7 +203,19 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), ...@@ -199,7 +203,19 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
private fun generateFunctionPermissionMap(data: List<GetConfigListBean.Item>) { private fun generateFunctionPermissionMap(data: List<GetConfigListBean.Item>) {
if (data.isEmpty()) return if (data.isEmpty()) return
functionPermissionList.clear() functionPermissionList.clear()
when (curLifeAccount.tag.tag_key) { when (getCurLifeAccountLabel()) {
Constant.LIFE_ACCOUNT_TAG_ENTERPRISE_AUTH -> {
// 企业认证
// 所有服务都可用
functionPermissionList.add(data[0].functions[0].function_id)
functionPermissionList.add(data[0].functions[1].function_id)
functionPermissionList.add(data[1].functions[0].function_id)
functionPermissionList.add(data[1].functions[1].function_id)
functionPermissionList.add(data[2].functions[0].function_id)
functionPermissionList.add(data[2].functions[1].function_id)
functionPermissionList.add(data[2].functions[2].function_id)
functionPermissionList.add(data[2].functions[3].function_id)
}
Constant.LIFE_ACCOUNT_TAG_COMMON_ENTERPRISE_AUTH -> { Constant.LIFE_ACCOUNT_TAG_COMMON_ENTERPRISE_AUTH -> {
// 普通企业认证 // 普通企业认证
// 所有服务都可用 // 所有服务都可用
...@@ -257,7 +273,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), ...@@ -257,7 +273,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
/** /**
* 过滤商户服务数据 * 过滤商户服务数据
* 目前处理个人认证下不展示管理服务 * 目前处理个人认证状态下和企业员工角色下不展示管理服务
*/ */
private fun filterMerchantServiceData(data: List<GetConfigListBean.Item>) { private fun filterMerchantServiceData(data: List<GetConfigListBean.Item>) {
val result = ArrayList<GetConfigListBean.Item>(data.size) val result = ArrayList<GetConfigListBean.Item>(data.size)
...@@ -267,7 +283,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), ...@@ -267,7 +283,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
val group = next() val group = next()
if (group.group_id == Constant.MERCHANT_SERVICE_GROUP_MANAGEMENT) { if (group.group_id == Constant.MERCHANT_SERVICE_GROUP_MANAGEMENT) {
// 个人认证或企业员工不展示管理服务 // 个人认证或企业员工不展示管理服务
if (curLifeAccount.tag.tag_key == Constant.LIFE_ACCOUNT_TAG_PERSONAL_AUTH || curLifeAccount.role_type == Constant.TYPE_ROLE_ORDINARY) { if (getCurLifeAccountLabel() == Constant.LIFE_ACCOUNT_TAG_PERSONAL_AUTH || curLifeAccount.role_type == Constant.TYPE_ROLE_ORDINARY) {
continue continue
} }
} }
...@@ -278,6 +294,26 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), ...@@ -278,6 +294,26 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
(viewBind.rvServiceGroup.adapter as MerchantServiceGroupAdapter).updateData(result) (viewBind.rvServiceGroup.adapter as MerchantServiceGroupAdapter).updateData(result)
} }
/**
* 获取当前生活号标签
* 目前不支持区分个体工商户和普通企业
*/
private fun getCurLifeAccountLabel(): Int {
when (curLifeAccount.enterprise_audit_status) {
Constant.STATUS_AUDIT_UNDER -> return Constant.LIFE_ACCOUNT_TAG_AUDIT_UNDER // 审核中
Constant.STATUS_AUDIT_REJECT -> return Constant.LIFE_ACCOUNT_TAG_AUTH_REJECT // 认证驳回
}
when (curLifeAccount.life_account_auth_status) {
Constant.STATUS_AUTH_FINISH -> {
when (curLifeAccount.life_account_type) {
Constant.TYPE_LIFE_ACCOUNT_PERSONAL -> return Constant.LIFE_ACCOUNT_TAG_PERSONAL_AUTH // 个人已认证
Constant.TYPE_LIFE_ACCOUNT_ENTERPRISE -> return Constant.TYPE_LIFE_ACCOUNT_ENTERPRISE // 企业已认证
}
}
}
return Constant.LIFE_ACCOUNT_TAG_NOT_AUTH // 个人未认证
}
override fun getConfigListSuccess(result: GetConfigListBean.Response?) { override fun getConfigListSuccess(result: GetConfigListBean.Response?) {
result?.let { result?.let {
// 备份配置数据 // 备份配置数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment