update 企业认证流程

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/bean/LifeAccountMerchantAuthData.kt

@@ -11,7 +11,8 @@ class LifeAccountMerchantAuthData {
     var businessLicenseObjectKey: String = ""
     var registrationName: String = ""
     var registrationCode: String = ""
-    var recordId: Long = 0
+    var authRecordId: Long? = null
+    var lifeAccountId: Long? = null
 
     // 营业执照相关信息
     var type: String? = null

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/bean/LifeAccountPersonalAuthData.kt

@@ -8,7 +8,7 @@ package com.yidian.shenghuoquan.newscontent.bean
 class LifeAccountPersonalAuthData {
     var realName: String = ""
     var idCardNum: String = ""
-    var phoneNum: String = ""
+    var phoneNum: String = "" // 法人手机号
     var occupation: String = ""
     var idCardPortraitFaceObjectKey: String = ""
     var idCardNationalEmblemFaceObjectKey: String = ""

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/AuthBusinessLicenseCommitBean.kt

@@ -29,6 +29,6 @@ class AuthBusinessLicenseCommitBean {
         val life_account_id: Long?,
     )
 
-    data class Response(val enterprise_auth_record_id: Int)
+    data class Response(val enterprise_auth_record_id: Long)
 
 }
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/AuthIndividualBusinessIdentityCommitBean.kt

@@ -21,7 +21,6 @@ class AuthIndividualBusinessIdentityCommitBean {
         val valid_date_start: String?,
         val valid_date_end: String?,
         val issued_by: String?,
-        val mobile: String
     )
 
 }
\ No newline at end of file

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

@@ -3,8 +3,6 @@ package com.yidian.shenghuoquan.newscontent.ui.auth
 import android.os.Bundle
 import android.util.Log
 import android.view.View
-import com.orhanobut.hawk.Hawk
-import com.yidian.common.HawkConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R

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

@@ -21,7 +21,7 @@ object LifeAccountAuthDataManager {
      */
     fun generatePersonalAuthData(data: GetIDCardOCRBean.Response) {
         personalAuthData.idCardPortraitFaceCompleteness = data.posit.completeness
-        personalAuthData.idCardNationalEmblemFaceCompleteness = data.posit.completeness
+        personalAuthData.idCardNationalEmblemFaceCompleteness = data.back.completeness
         personalAuthData.idCardNum = data.posit.idcard_number
         personalAuthData.gender = data.posit.gender
         personalAuthData.realName = data.posit.name
@@ -102,7 +102,9 @@ object LifeAccountAuthDataManager {
         requestMap["entterprise_image"] = merchantAuthData.businessLicenseObjectKey
         requestMap["data_from"] = Constant.DATA_FROM_B.toString()
         requestMap["data_type"] = dataType.toString()
-        requestMap["life_account_id"] = lifeAccountId.toString()
+        lifeAccountId?.let {
+            requestMap["life_account_id"] = it.toString()
+        }
         return requestMap
     }
 
@@ -111,7 +113,7 @@ object LifeAccountAuthDataManager {
      */
     fun generateAuthIndividualBusinessIdentityCommitRequest(): HashMap<String, String?> {
         val requestMap = HashMap<String, String?>()
-        requestMap["record_id"] = merchantAuthData.recordId.toString()
+        requestMap["record_id"] = merchantAuthData.authRecordId.toString()
         requestMap["front_img"] = personalAuthData.idCardPortraitFaceObjectKey
         requestMap["bak_img"] = personalAuthData.idCardNationalEmblemFaceObjectKey
         requestMap["front_completeness"] =
@@ -126,7 +128,6 @@ object LifeAccountAuthDataManager {
         requestMap["valid_date_start"] = personalAuthData.validDateStart
         requestMap["valid_date_end"] = personalAuthData.validDateEnd
         requestMap["issued_by"] = personalAuthData.issuedBy
-        requestMap["mobile"] = personalAuthData.phoneNum
         return requestMap
     }
 
@@ -137,7 +138,7 @@ object LifeAccountAuthDataManager {
         lifeAccountId: Long?
     ): HashMap<String, String?> {
         val requestMap = HashMap<String, String?>()
-        requestMap["record_id"] = merchantAuthData.recordId.toString()
+        requestMap["record_id"] = merchantAuthData.authRecordId.toString()
         requestMap["front_img"] = personalAuthData.idCardPortraitFaceObjectKey
         requestMap["bak_img"] = personalAuthData.idCardNationalEmblemFaceObjectKey
         requestMap["front_completeness"] =
@@ -152,8 +153,10 @@ object LifeAccountAuthDataManager {
         requestMap["valid_date_start"] = personalAuthData.validDateStart
         requestMap["valid_date_end"] = personalAuthData.validDateEnd
         requestMap["issued_by"] = personalAuthData.issuedBy
-        requestMap["life_account_id"] = lifeAccountId.toString()
         requestMap["mobile"] = personalAuthData.phoneNum
+        lifeAccountId?.let {
+            requestMap["life_account_id"] = it.toString()
+        }
         return requestMap
     }
 }
\ No newline at end of file

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

@@ -281,5 +281,7 @@ class LifeAccountBusinessLicenseAuthFragment :
         } else {
             LifeAccountAuthDataManager.merchantAuthData.registrationCode = text
         }
+        // 检查下一步条件
+        (activity as LifeAccountEnterpriseAuthActivity).checkNextCondition()
     }
 }
\ No newline at end of file

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

@@ -32,8 +32,15 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
     IAuthBusinessLicenseCommitCallback, IAuthEnterpriseLegalIdentityCommitCallback,
     IAuthIndividualBusinessCompleteCallback {
 
+    companion object {
+        /**
+         * 生活号id 个人生活号主动升级企业生活号的认证流程传入
+         */
+        const val EXTRA_LIFE_ACCOUNT_ID = "life_account_id"
+    }
+
     private val fragmentList: ArrayList<Fragment> by lazy {
-        arrayListOf<Fragment>(
+        arrayListOf(
             LifeAccountBusinessLicenseAuthFragment(),
             LifeAccountIDCardAuthFragment()
         )
@@ -44,6 +51,15 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
      */
     private var curFragment: Fragment? = null
 
+    /**
+     * 当前生活号id，个人生活号升级使用
+     */
+    private val curLifeAccountId by lazy {
+        intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let {
+            (it as HashMap<*, *>)[EXTRA_LIFE_ACCOUNT_ID] as Long
+        }
+    }
+
     override fun createViewBinding(): ActivityLifeAccountEnterpriseAuthBinding {
         return ActivityLifeAccountEnterpriseAuthBinding.inflate(layoutInflater)
     }
@@ -168,20 +184,25 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
                         this,
                         LifeAccountAuthDataManager.generateAuthBusinessLicenseCommitRequest(
                             LifeAccountAuthDataManager.merchantAuthData.merchantType,
-                            null
+                            curLifeAccountId
                         )
                     )
                 } else if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_MANAGER) {
                     if (LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_INDIVIDUAL_BUSINESS) {
-                        val params = HashMap<String, String?>()
-                        params["record_id"] =
-                            LifeAccountAuthDataManager.merchantAuthData.recordId.toString()
-                        ApiService.authIndividualBusinessComplete(this, params)
+                        ApiService.authIndividualBusinessComplete(
+                            this,
+                            hashMapOf(
+                                Pair(
+                                    "record_id",
+                                    LifeAccountAuthDataManager.merchantAuthData.authRecordId.toString()
+                                )
+                            )
+                        )
                     } else if (LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_COMMON_ENTERPRISE) {
                         ApiService.authEnterpriseLegalIdentityCommit(
                             this,
                             LifeAccountAuthDataManager.generateAuthEnterpriseLegalIdentityCommitRequest(
-                                null
+                                curLifeAccountId
                             )
                         )
                     }
@@ -206,6 +227,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
 
     override fun authBusinessLicenseCommitSuccess(result: AuthBusinessLicenseCommitBean.Response?) {
         // 营业执照提交成功
+        LifeAccountAuthDataManager.merchantAuthData.authRecordId = result?.enterprise_auth_record_id
         viewBind.pvAuthProcess.setProcess(++viewBind.pvAuthProcess.curProcess)
         viewBind.svMerchantType.enableSelect(false)
         // 向身份信息fragment传参

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

@@ -500,10 +500,15 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
                 // 检查下一步条件
                 (activity as LifeAccountPersonalAuthActivity).checkNextCondition()
             } else {
-                val params = HashMap<String, String?>(1)
-                params["record_id"] =
-                    LifeAccountAuthDataManager.merchantAuthData.recordId.toString()
-                ApiService.authEnterpriseLiveIdentity(this, params)
+                ApiService.authEnterpriseLiveIdentity(
+                    this,
+                    hashMapOf(
+                        Pair(
+                            "record_id",
+                            LifeAccountAuthDataManager.merchantAuthData.authRecordId.toString()
+                        )
+                    )
+                )
                 // 检查下一步条件
                 (activity as LifeAccountEnterpriseAuthActivity).checkNextCondition()
             }
@@ -650,6 +655,8 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
         } else {
             LifeAccountAuthDataManager.personalAuthData.isIDCardNationalEmblemFaceUpload = false
         }
+        // 检查下一步条件
+        (activity as LifeAccountEnterpriseAuthActivity).checkNextCondition()
     }
 
     override fun onTextClear(from: LifeAccountAuthIdentityInfoEditView) {
@@ -664,6 +671,8 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
                 LifeAccountAuthDataManager.personalAuthData.phoneNum = ""
             }
         }
+        // 检查下一步条件
+        (activity as LifeAccountEnterpriseAuthActivity).checkNextCondition()
     }
 
     override fun onTextChange(from: LifeAccountAuthIdentityInfoEditView, text: String) {
@@ -678,6 +687,8 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
                 LifeAccountAuthDataManager.personalAuthData.phoneNum = text
             }
         }
+        // 检查下一步条件
+        (activity as LifeAccountEnterpriseAuthActivity).checkNextCondition()
     }
 
     override fun onStartFaceAuth() {