fix SHQBD-886 修复C端创建的未认证生活号在B端认证的逻辑

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountAuthActivity.kt

@@ -28,6 +28,20 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
     const val EXTRA_PAGE_FROM = "from"
 
     const val FROM_AUTH = "auth"
+
+    // 生活号id
+    const val EXTRA_LIFE_ACCOUNT_ID = "life_account_id"
+  }
+
+  /**
+   * 生活号id
+   */
+  private val lifeAccountId by lazy {
+    intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let { params ->
+      (params as HashMap<*, *>)[EXTRA_LIFE_ACCOUNT_ID]?.let {
+        it as String
+      }
+    }
   }
 
   override fun createViewBinding(): ActivityLifeAccountAuthBinding {
@@ -103,7 +117,10 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
     // 跳转个人认证页
     XPageManager.push(
       XRouterPathConstants.LIFE_ACCOUNT_PERSONAL_AUTH,
-      hashMapOf(Pair(LifeAccountPersonalAuthActivity.EXTRA_AUTH_DATA, result))
+      hashMapOf(
+        Pair(LifeAccountPersonalAuthActivity.EXTRA_AUTH_DATA, result),
+        Pair(LifeAccountPersonalAuthActivity.EXTRA_LIFE_ACCOUNT_ID, lifeAccountId)
+      )
     )
   }
 
@@ -117,7 +134,10 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
     // 跳转企业认证页
     XPageManager.push(
       XRouterPathConstants.LIFE_ACCOUNT_ENTERPRISE_AUTH,
-      hashMapOf(Pair(LifeAccountEnterpriseAuthActivity.EXTRA_AUTH_DATA, result))
+      hashMapOf(
+        Pair(LifeAccountEnterpriseAuthActivity.EXTRA_AUTH_DATA, result),
+        Pair(LifeAccountEnterpriseAuthActivity.EXTRA_LIFE_ACCOUNT_ID, lifeAccountId)
+      )
     )
   }
 

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt

@@ -403,7 +403,10 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
     // 由未认证升级认证 跳转认证首页
     XPageManager.push(
       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)
+      )
     )
   }