update 企业认证接口

CommonLib/Common/src/main/java/com/yidian/common/http/URLs.kt

@@ -38,11 +38,11 @@ class URLs {
         const val authLiveIdentity = "/merchant/auth/live_identity"
         const val authComplete = "/merchant/auth/complete"
         const val authAuthentication = "/merchant/auth/authentication"
-        const val authMerchantCheck = "/merchant/enterprise/ent_check"
-        const val authBusinessLicenseCommit = "/merchant/enterprise/ent_commit"
-        const val authEnterpriseLegalIdentityCommit = "/merchant/enterprise/legal_commit"
-        const val authIndividualBusinessIdentityCommit = "/merchant/enterprise/ent_personal"
-        const val authEnterpriseLiveIdentity = "/merchant/enterprise/live_identity"
-        const val authEnterpriseComplete = "/merchant/enterprise/complete"
+        const val authMerchantCheck = "/merchant/enterprise/check"
+        const val authBusinessLicenseCommit = "/merchant/enterprise/business"
+        const val authEnterpriseLegalIdentityCommit = "/merchant/enterprise/legal"
+        const val authIndividualBusinessIdentityCommit = "/merchant/enterprise/employed"
+        const val authEnterpriseLiveIdentity = "/merchant/enterprise/live"
+        const val authIndividualBusinessComplete = "/merchant/enterprise/employed_complate"
     }
 }
\ No newline at end of file

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

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

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

@@ -335,7 +335,7 @@ class ApiService {
                 })
         }
 
-        // 401 商户认证检查
+        // 401 商户认证检查接口
         fun authMerchantCheck(apiCallback: IAuthMerchantCheckCallback, requestParams: HashMap<String, String?>) {
             val timeStamp = System.currentTimeMillis()
             val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
@@ -354,7 +354,7 @@ class ApiService {
                 })
         }
 
-        // 402 商户上传营业执照信息
+        // 402 商户上传营业执照信息接口
         fun authBusinessLicenseCommit(apiCallback: IAuthBusinessLicenseCommitCallback, requestParams: HashMap<String, String?>) {
             val timeStamp = System.currentTimeMillis()
             val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
@@ -373,7 +373,7 @@ class ApiService {
                 })
         }
 
-        // 403 普通企业上传法人身份信息
+        // 403 普通企业上传法人身份信息接口
         fun authEnterpriseLegalIdentityCommit(apiCallback: IAuthEnterpriseLegalIdentityCommitCallback, requestParams: HashMap<String, String?>) {
             val timeStamp = System.currentTimeMillis()
             val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
@@ -381,18 +381,18 @@ class ApiService {
             ServiceFactory.getInstance().createService(CommonService::class.java)
                 .authEnterpriseLegalIdentityCommit(publicParamsMap, privateParamsMap)
                 .compose(TransformUtil.defaultSchedulers())
-                .subscribe(object : HttpResultSubscriber<Any?>() {
-                    override fun onSuccess(result: HttpResult<Any?>?) {
-                        apiCallback.authEnterpriseLegalIdentityCommitSuccess()
+                .subscribe(object : HttpResultSubscriber<AuthEnterpriseLegalIdentityCommitBean.Response?>() {
+                    override fun onSuccess(result: HttpResult<AuthEnterpriseLegalIdentityCommitBean.Response?>?) {
+                        apiCallback.authEnterpriseLegalIdentityCommitSuccess(result?.result)
                     }
 
-                    override fun onFailer(result: HttpResult<Any?>?) {
+                    override fun onFailer(result: HttpResult<AuthEnterpriseLegalIdentityCommitBean.Response?>?) {
                         apiCallback.authEnterpriseLegalIdentityCommitFailure(result?.reason)
                     }
                 })
         }
 
-        // 404 个体工商户身份认证
+        // 404 个体工商户身份认证接口
         fun authIndividualBusinessIdentityCommit(apiCallback: IAuthIndividualBusinessIdentityCommitCallback, requestParams: HashMap<String, String?>) {
             val timeStamp = System.currentTimeMillis()
             val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
@@ -430,21 +430,21 @@ class ApiService {
                 })
         }
 
-        // 410 企业认证完成认证
-        fun authEnterpriseComplete(apiCallback: IAuthEnterpriseCompleteCallback, requestParams: HashMap<String, String?>) {
+        // 406 个体工商户认证完成接口
+        fun authIndividualBusinessComplete(apiCallback: IAuthIndividualBusinessCompleteCallback, requestParams: HashMap<String, String?>) {
             val timeStamp = System.currentTimeMillis()
             val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
             val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
             ServiceFactory.getInstance().createService(CommonService::class.java)
-                .authEnterpriseComplete(publicParamsMap, privateParamsMap)
+                .authIndividualBusinessComplete(publicParamsMap, privateParamsMap)
                 .compose(TransformUtil.defaultSchedulers())
-                .subscribe(object : HttpResultSubscriber<AuthEnterpriseCompleteBean.Response?>() {
-                    override fun onSuccess(result: HttpResult<AuthEnterpriseCompleteBean.Response?>?) {
-                        apiCallback.authEnterpriseCompleteSuccess(result?.result)
+                .subscribe(object : HttpResultSubscriber<AuthIndividualBusinessCompleteBean.Response?>() {
+                    override fun onSuccess(result: HttpResult<AuthIndividualBusinessCompleteBean.Response?>?) {
+                        apiCallback.authIndividualBusinessCompleteSuccess(result?.result)
                     }
 
-                    override fun onFailer(result: HttpResult<AuthEnterpriseCompleteBean.Response?>?) {
-                        apiCallback.authEnterpriseCompleteFailure(result?.reason)
+                    override fun onFailer(result: HttpResult<AuthIndividualBusinessCompleteBean.Response?>?) {
+                        apiCallback.authIndividualBusinessCompleteFailure(result?.reason)
                     }
                 })
         }

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

@@ -91,6 +91,6 @@ interface CommonService {
     @GET(URLs.authEnterpriseLiveIdentity)
     fun authEnterpriseLiveIdentity(@QueryMap commonParams: Map<String, String>, @QueryMap requestParams: Map<String, String?>) : Observable<HttpResult<Any?>>
 
-    @GET(URLs.authEnterpriseComplete)
-    fun authEnterpriseComplete(@QueryMap commonParams: Map<String, String>, @QueryMap requestParams: Map<String, String?>) : Observable<HttpResult<Any?>>
+    @GET(URLs.authIndividualBusinessComplete)
+    fun authIndividualBusinessComplete(@QueryMap commonParams: Map<String, String>, @QueryMap requestParams: Map<String, String?>) : Observable<HttpResult<Any?>>
 }
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/callback/IAuthBusinessLicenseCommitCallback.kt

@@ -5,7 +5,7 @@ import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthBusinessLicenseComm
 /**
  * author: yinjiacheng
  * date: 6/3/21 7:25 PM
- * description: API /merchant/enterprise/ent_commit
+ * description: API /merchant/enterprise/business
  */
 interface IAuthBusinessLicenseCommitCallback {
     fun authBusinessLicenseCommitSuccess(result: AuthBusinessLicenseCommitBean.Response?)

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/callback/IAuthEnterpriseCompleteCallback.kt

-package com.yidian.shenghuoquan.newscontent.http.callback
-
-import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthEnterpriseCompleteBean
-
-/**
- * author: yinjiacheng
- * date: 6/3/21 9:12 PM
- * description: API /merchant/enterprise/complete
- */
-interface IAuthEnterpriseCompleteCallback {
-    fun authEnterpriseCompleteSuccess(result: AuthEnterpriseCompleteBean.Response?)
-    fun authEnterpriseCompleteFailure(message: String?)
-}
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/callback/IAuthEnterpriseLegalIdentityCommitCallback.kt

 package com.yidian.shenghuoquan.newscontent.http.callback
 
+import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthEnterpriseLegalIdentityCommitBean
+
 /**
  * author: yinjiacheng
  * date: 6/3/21 8:38 PM
- * description: API /merchant/enterprise/ent_commit
+ * description: API /merchant/enterprise/legal
  */
 interface IAuthEnterpriseLegalIdentityCommitCallback {
-    fun authEnterpriseLegalIdentityCommitSuccess()
+    fun authEnterpriseLegalIdentityCommitSuccess(result: AuthEnterpriseLegalIdentityCommitBean.Response?)
     fun authEnterpriseLegalIdentityCommitFailure(message: String?)
 }
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/callback/IAuthEnterpriseLiveIdentityCallback.kt

@@ -3,7 +3,7 @@ package com.yidian.shenghuoquan.newscontent.http.callback
 /**
  * author: yinjiacheng
  * date: 6/3/21 9:06 PM
- * description: API /merchant/enterprise/live_identity
+ * description: API /merchant/enterprise/live
  */
 interface IAuthEnterpriseLiveIdentityCallback {
     fun authEnterpriseLiveIdentitySuccess()

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/callback/IAuthIndividualBusinessCompleteCallback.kt

+package com.yidian.shenghuoquan.newscontent.http.callback
+
+import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthIndividualBusinessCompleteBean
+
+/**
+ * author: yinjiacheng
+ * date: 6/3/21 9:12 PM
+ * description: API /merchant/enterprise/employed_complate
+ */
+interface IAuthIndividualBusinessCompleteCallback {
+    fun authIndividualBusinessCompleteSuccess(result: AuthIndividualBusinessCompleteBean.Response?)
+    fun authIndividualBusinessCompleteFailure(message: String?)
+}
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/callback/IAuthIndividualBusinessIdentityCommitCallback.kt

@@ -3,7 +3,7 @@ package com.yidian.shenghuoquan.newscontent.http.callback
 /**
  * author: yinjiacheng
  * date: 6/3/21 8:55 PM
- * description: API /merchant/enterprise/ent_personal
+ * description: API /merchant/enterprise/employed
  */
 interface IAuthIndividualBusinessIdentityCommitCallback {
     fun authIndividualBusinessIdentityCommitSuccess()

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/callback/IAuthMerchantCheckCallback.kt

@@ -5,7 +5,7 @@ import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthMerchantCheckBean
 /**
  * author: yinjiacheng
  * date: 6/3/21 6:21 PM
- * description: API /merchant/enterprise/ent_check
+ * description: API /merchant/enterprise/check
  */
 interface IAuthMerchantCheckCallback {
     fun authMerchantCheckSuccess(result: AuthMerchantCheckBean.Response?)

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

@@ -3,12 +3,11 @@ package com.yidian.shenghuoquan.newscontent.http.httpbean
 /**
  * author: yinjiacheng
  * date: 6/3/21 6:23 PM
- * description: API /merchant/enterprise/ent_commit
+ * description: API /merchant/enterprise/business
  */
 class AuthBusinessLicenseCommitBean {
 
     data class Request(
-        val user_id: Long,
         val code: String,
         val name: String,
         val type: String?,
@@ -28,10 +27,8 @@ class AuthBusinessLicenseCommitBean {
         val data_from: Int,
         val data_type: Int,
         val life_account_id: Long?,
-        val proxy_user_name: String?,
-        val mobile: String?,
-        val is_agent: Int?
     )
 
-    data class Response(val data: Int)
+    data class Response(val record_id: Int)
+
 }
\ No newline at end of file

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

-package com.yidian.shenghuoquan.newscontent.http.httpbean
-
-/**
- * author: yinjiacheng
- * date: 6/3/21 9:08 PM
- * description: API /merchant/enterprise/complete
- */
-class AuthEnterpriseCompleteBean {
-
-    data class Request(val code: String)
-
-    data class Response(
-        val enterprise_auth_record_id: Long,
-        val code: String,
-        val name: String,
-        val legal_person: String,
-        val legal_id_card: String,
-        val data_type: Int,
-        val audit_status: Int
-
-    )
-}
\ No newline at end of file

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

@@ -3,9 +3,9 @@ package com.yidian.shenghuoquan.newscontent.http.httpbean
 /**
  * author: yinjiacheng
  * date: 6/3/21 7:37 PM
- * description: API /merchant/enterprise/ent_commit
+ * description: API /merchant/enterprise/legal
  */
-class AuthEnterpriseLegalIdentityCommitBean() {
+class AuthEnterpriseLegalIdentityCommitBean {
 
     data class Request(
         val record_id: Long,
@@ -22,9 +22,9 @@ class AuthEnterpriseLegalIdentityCommitBean() {
         val valid_date_end: String?,
         val issued_by: String?,
         val life_account_id: Long?,
-        val proxy_user_name: String?,
         val mobile: String,
-        val is_agent: String?
     )
 
+    data class Response(val life_account_id: Long)
+
 }
\ No newline at end of file

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

@@ -3,9 +3,10 @@ package com.yidian.shenghuoquan.newscontent.http.httpbean
 /**
  * author: yinjiacheng
  * date: 6/3/21 9:05 PM
- * description: API /merchant/enterprise/live_identity
+ * description: API /merchant/enterprise/live
  */
 class AuthEnterpriseLiveIdentityBean {
 
-    data class Request(val code: String, val idcard_number: String)
+    data class Request(val record_id: Long)
+
 }
\ No newline at end of file

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

+package com.yidian.shenghuoquan.newscontent.http.httpbean
+
+/**
+ * author: yinjiacheng
+ * date: 6/3/21 9:08 PM
+ * description: API /merchant/enterprise/employed_complate
+ */
+class AuthIndividualBusinessCompleteBean {
+
+    data class Request(val record_id: Long)
+
+    data class Response(val life_account_id: Long)
+
+}
\ No newline at end of file

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

@@ -3,13 +3,12 @@ package com.yidian.shenghuoquan.newscontent.http.httpbean
 /**
  * author: yinjiacheng
  * date: 6/3/21 8:41 PM
- * description: API /merchant/enterprise/ent_personal
+ * description: API /merchant/enterprise/employed
  */
 class AuthIndividualBusinessIdentityCommitBean {
 
     data class Request(
-        val code: String,
-        val data_type: Int,
+        val record_id: Long,
         val front_img: String,
         val bak_img: String,
         val front_completeness: Int,
@@ -22,8 +21,7 @@ class AuthIndividualBusinessIdentityCommitBean {
         val valid_date_start: String?,
         val valid_date_end: String?,
         val issued_by: String?,
-        val proxy_user_name: String?,
-        val phone: String?,
-        val is_agent: Int?
+        val mobile: String
     )
+
 }
\ No newline at end of file

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

@@ -3,16 +3,28 @@ package com.yidian.shenghuoquan.newscontent.http.httpbean
 /**
  * author: yinjiacheng
  * date: 6/3/21 6:05 PM
- * description: API /merchant/enterprise/ent_check
+ * description: API /merchant/enterprise/check
  */
 class AuthMerchantCheckBean {
 
     data class Request(
-        val user_id: Long,
         val life_account_id: Long?,
-        val mobile: String?,
-        val is_agent: Int?
     )
 
-    data class Response(val enterprise_auth_record_id: Int)
+    data class Response(
+        val audit_opinion: String,
+        val audit_status: Int,
+        val code: String,
+        val data_type: Int,
+        val enterprise_auth_record_id: Int,
+        val entterprise_image: String,
+        val legal_back_id_card: String,
+        val legal_front_id_card: String,
+        val legal_id_card: String,
+        val legal_person: String,
+        val live_identity_status: Int,
+        val mobile: String,
+        val name: String
+    )
+
 }
\ No newline at end of file

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

@@ -75,7 +75,7 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
             R.id.view_enterprise_auth -> {
                 // 请求企业认证信息 用于回显已填入的信息
                 val params = HashMap<String, String?>(1)
-                params["user_id"] = Hawk.get(HawkConfig.UserId, "")
+                params["life_account_id"] = null
                 ApiService.authMerchantCheck(this, params)
             }
         }

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

@@ -80,12 +80,10 @@ object LifeAccountAuthDataManager {
      * 生成营业执照上传接口请求体
      */
     fun generateAuthBusinessLicenseCommitRequest(
-        userId: Long,
         dataType: Int,
         lifeAccountId: Long?
     ): HashMap<String, String?> {
         val requestMap = HashMap<String, String?>()
-        requestMap["user_id"] = userId.toString()
         requestMap["code"] = merchantAuthData.registrationCode
         requestMap["name"] = merchantAuthData.registrationName
         requestMap["type"] = merchantAuthData.type
@@ -105,21 +103,15 @@ object LifeAccountAuthDataManager {
         requestMap["data_from"] = Constant.DATA_FROM_B.toString()
         requestMap["data_type"] = dataType.toString()
         requestMap["life_account_id"] = lifeAccountId.toString()
-        requestMap["proxy_user_name"] = null
-        requestMap["mobile"] = null
-        requestMap["is_agent"] = null
         return requestMap
     }
 
     /**
      * 生成个体工商户身份上传接口请求体
      */
-    fun generateAuthIndividualBusinessIdentityCommitRequest(
-        dataType: Int
-    ): HashMap<String, String?> {
+    fun generateAuthIndividualBusinessIdentityCommitRequest(): HashMap<String, String?> {
         val requestMap = HashMap<String, String?>()
-        requestMap["code"] = merchantAuthData.registrationCode
-        requestMap["data_type"] = dataType.toString()
+        requestMap["record_id"] = merchantAuthData.recordId.toString()
         requestMap["front_img"] = personalAuthData.idCardPortraitFaceObjectKey
         requestMap["bak_img"] = personalAuthData.idCardNationalEmblemFaceObjectKey
         requestMap["front_completeness"] =
@@ -134,9 +126,7 @@ object LifeAccountAuthDataManager {
         requestMap["valid_date_start"] = personalAuthData.validDateStart
         requestMap["valid_date_end"] = personalAuthData.validDateEnd
         requestMap["issued_by"] = personalAuthData.issuedBy
-        requestMap["proxy_user_name"] = null
-        requestMap["phone"] = null
-        requestMap["is_agent"] = null
+        requestMap["mobile"] = personalAuthData.phoneNum
         return requestMap
     }
 
@@ -144,11 +134,10 @@ object LifeAccountAuthDataManager {
      * 生成普通企业法人身份信息上传接口请求体
      */
     fun generateAuthEnterpriseLegalIdentityCommitRequest(
-        authRecordId: Long,
         lifeAccountId: Long?
     ): HashMap<String, String?> {
         val requestMap = HashMap<String, String?>()
-        requestMap["record_id"] = authRecordId.toString()
+        requestMap["record_id"] = merchantAuthData.recordId.toString()
         requestMap["front_img"] = personalAuthData.idCardPortraitFaceObjectKey
         requestMap["bak_img"] = personalAuthData.idCardNationalEmblemFaceObjectKey
         requestMap["front_completeness"] =
@@ -164,9 +153,7 @@ object LifeAccountAuthDataManager {
         requestMap["valid_date_end"] = personalAuthData.validDateEnd
         requestMap["issued_by"] = personalAuthData.issuedBy
         requestMap["life_account_id"] = lifeAccountId.toString()
-        requestMap["proxy_user_name"] = null
         requestMap["mobile"] = personalAuthData.phoneNum
-        requestMap["is_agent"] = null
         return requestMap
     }
 }
\ No newline at end of file

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

@@ -4,8 +4,6 @@ import android.os.Bundle
 import android.util.Log
 import android.view.View
 import androidx.fragment.app.Fragment
-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
@@ -15,10 +13,11 @@ import com.yidian.shenghuoquan.newscontent.constant.Constant
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountEnterpriseAuthBinding
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IAuthBusinessLicenseCommitCallback
-import com.yidian.shenghuoquan.newscontent.http.callback.IAuthEnterpriseCompleteCallback
+import com.yidian.shenghuoquan.newscontent.http.callback.IAuthIndividualBusinessCompleteCallback
 import com.yidian.shenghuoquan.newscontent.http.callback.IAuthEnterpriseLegalIdentityCommitCallback
 import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthBusinessLicenseCommitBean
-import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthEnterpriseCompleteBean
+import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthEnterpriseLegalIdentityCommitBean
+import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthIndividualBusinessCompleteBean
 import com.yidian.shenghuoquan.newscontent.ui.dialog.BottomSelectDialog
 import com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthProcessView
 import com.yidian.xpage.XPageManager
@@ -31,7 +30,7 @@ import com.yidian.xpage.XPageManager
 class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterpriseAuthBinding>(),
     View.OnClickListener, BottomSelectAdapter.OnItemClickListener<BottomSelectBean>,
     IAuthBusinessLicenseCommitCallback, IAuthEnterpriseLegalIdentityCommitCallback,
-    IAuthEnterpriseCompleteCallback {
+    IAuthIndividualBusinessCompleteCallback {
 
     private val fragmentList: ArrayList<Fragment> by lazy {
         arrayListOf<Fragment>(
@@ -165,11 +164,9 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
             R.id.btn_next -> {
                 if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_QUALIFICATION) {
                     // TODO: 6/4/21 判断是否为个人生活号升级
-
                     ApiService.authBusinessLicenseCommit(
                         this,
                         LifeAccountAuthDataManager.generateAuthBusinessLicenseCommitRequest(
-                            Hawk.get<Long>(HawkConfig.UserId),
                             LifeAccountAuthDataManager.merchantAuthData.merchantType,
                             null
                         )
@@ -177,14 +174,14 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
                 } else if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_MANAGER) {
                     if (LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_INDIVIDUAL_BUSINESS) {
                         val params = HashMap<String, String?>()
-                        params["code"] =
-                            LifeAccountAuthDataManager.merchantAuthData.registrationCode
-                        ApiService.authEnterpriseComplete(this, params)
+                        params["record_id"] =
+                            LifeAccountAuthDataManager.merchantAuthData.recordId.toString()
+                        ApiService.authIndividualBusinessComplete(this, params)
                     } else if (LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_COMMON_ENTERPRISE) {
                         ApiService.authEnterpriseLegalIdentityCommit(
                             this,
                             LifeAccountAuthDataManager.generateAuthEnterpriseLegalIdentityCommitRequest(
-                                123, null
+                                null
                             )
                         )
                     }
@@ -230,13 +227,9 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
         )
     }
 
-    override fun authEnterpriseLegalIdentityCommitSuccess() {
-        // 普通企业法人身份信息提交成功 请求企业认证完成接口
+    override fun authEnterpriseLegalIdentityCommitSuccess(result: AuthEnterpriseLegalIdentityCommitBean.Response?) {
+        // 普通企业法人身份信息提交成功
         // TODO: 6/6/21 跳转提交成功页面
-        val params = HashMap<String, String?>()
-        params["code"] =
-            LifeAccountAuthDataManager.merchantAuthData.registrationCode
-        ApiService.authEnterpriseComplete(this, params)
     }
 
     override fun authEnterpriseLegalIdentityCommitFailure(message: String?) {
@@ -246,12 +239,12 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
         )
     }
 
-    override fun authEnterpriseCompleteSuccess(result: AuthEnterpriseCompleteBean.Response?) {
-        // 企业认证完成
+    override fun authIndividualBusinessCompleteSuccess(result: AuthIndividualBusinessCompleteBean.Response?) {
+        // 个体工商户认证完成
         // TODO: 6/6/21 跳转提交成功页面
     }
 
-    override fun authEnterpriseCompleteFailure(message: String?) {
+    override fun authIndividualBusinessCompleteFailure(message: String?) {
         Log.e(
             Constant.LIFE_ACCOUNT_AUTH_TAG,
             "request auth enterprise complete failure, message: $message"

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

@@ -494,9 +494,9 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
                 // 检查下一步条件
                 (activity as LifeAccountPersonalAuthActivity).checkNextCondition()
             } else {
-                val params = HashMap<String, String?>(2)
-                params["code"] = LifeAccountAuthDataManager.merchantAuthData.registrationCode
-                params["idcard_number"] = LifeAccountAuthDataManager.personalAuthData.idCardNum
+                val params = HashMap<String, String?>(1)
+                params["record_id"] =
+                    LifeAccountAuthDataManager.merchantAuthData.recordId.toString()
                 ApiService.authEnterpriseLiveIdentity(this, params)
                 // 检查下一步条件
                 (activity as LifeAccountEnterpriseAuthActivity).checkNextCondition()
@@ -683,9 +683,7 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
             Constant.TYPE_AUTH_INDIVIDUAL_BUSINESS -> {
                 ApiService.authIndividualBusinessIdentityCommit(
                     this,
-                    LifeAccountAuthDataManager.generateAuthIndividualBusinessIdentityCommitRequest(
-                        Constant.TYPE_INDIVIDUAL_BUSINESS
-                    )
+                    LifeAccountAuthDataManager.generateAuthIndividualBusinessIdentityCommitRequest()
                 )
             }
         }