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
e067a1a7
Commit
e067a1a7
authored
Jul 22, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix SHQBD-886 修复C端创建的未认证生活号在B端认证的逻辑
parent
e85ce931
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
MerchantAuthManagementActivity.kt
...n/newscontent/ui/center/MerchantAuthManagementActivity.kt
+4
-1
MerchantCenterActivity.kt
...nghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
+4
-1
MerchantInfoActivity.kt
...henghuoquan/newscontent/ui/center/MerchantInfoActivity.kt
+4
-1
No files found.
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantAuthManagementActivity.kt
View file @
e067a1a7
...
@@ -55,7 +55,10 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
...
@@ -55,7 +55,10 @@ class MerchantAuthManagementActivity : Activity(), XPageViewProtocol, IGetLifeAc
// 未认证跳转认证首页
// 未认证跳转认证首页
XPageManager
.
push
(
XPageManager
.
push
(
XRouterPathConstants
.
LIFE_ACCOUNT_AUTH
,
XRouterPathConstants
.
LIFE_ACCOUNT_AUTH
,
hashMapOf
(
Pair
(
LifeAccountAuthActivity
.
EXTRA_PAGE_FROM
,
LifeAccountAuthActivity
.
FROM_AUTH
))
hashMapOf
(
Pair
(
LifeAccountAuthActivity
.
EXTRA_PAGE_FROM
,
LifeAccountAuthActivity
.
FROM_AUTH
),
Pair
(
LifeAccountAuthActivity
.
EXTRA_LIFE_ACCOUNT_ID
,
lifeAccountId
)
)
)
)
finish
()
finish
()
}
}
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
View file @
e067a1a7
...
@@ -488,7 +488,10 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
...
@@ -488,7 +488,10 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
// 进行认证
// 进行认证
XPageManager
.
push
(
XPageManager
.
push
(
XRouterPathConstants
.
LIFE_ACCOUNT_AUTH
,
XRouterPathConstants
.
LIFE_ACCOUNT_AUTH
,
hashMapOf
(
Pair
(
LifeAccountAuthActivity
.
EXTRA_PAGE_FROM
,
LifeAccountAuthActivity
.
FROM_AUTH
))
hashMapOf
(
Pair
(
LifeAccountAuthActivity
.
EXTRA_PAGE_FROM
,
LifeAccountAuthActivity
.
FROM_AUTH
),
Pair
(
LifeAccountAuthActivity
.
EXTRA_LIFE_ACCOUNT_ID
,
curLifeAccount
.
life_account_id
)
)
)
)
}
}
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantInfoActivity.kt
View file @
e067a1a7
...
@@ -165,7 +165,10 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
...
@@ -165,7 +165,10 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
// 未认证 进入认证流程首页 此处需要传参from控制认证流程首页返回按钮显示
// 未认证 进入认证流程首页 此处需要传参from控制认证流程首页返回按钮显示
XPageManager
.
push
(
XPageManager
.
push
(
XRouterPathConstants
.
LIFE_ACCOUNT_AUTH
,
XRouterPathConstants
.
LIFE_ACCOUNT_AUTH
,
hashMapOf
(
Pair
(
LifeAccountAuthActivity
.
EXTRA_PAGE_FROM
,
LifeAccountAuthActivity
.
FROM_AUTH
))
hashMapOf
(
Pair
(
LifeAccountAuthActivity
.
EXTRA_PAGE_FROM
,
LifeAccountAuthActivity
.
FROM_AUTH
),
Pair
(
LifeAccountAuthActivity
.
EXTRA_LIFE_ACCOUNT_ID
,
lifeAccountInfo
?.
life_account_id
)
)
)
)
}
else
if
(
lifeAccountInfo
?.
audit_status
==
Constant
.
STATUS_AUDIT_REJECT
)
{
}
else
if
(
lifeAccountInfo
?.
audit_status
==
Constant
.
STATUS_AUDIT_REJECT
)
{
// 认证驳回 请求企业认证信息 此处为升级认证情况 需要传入生活号id
// 认证驳回 请求企业认证信息 此处为升级认证情况 需要传入生活号id
...
...
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