fix SHQBD-195 区分直接企业认证、个人认证升级和认证修改情况下402、403、406接口的请求参数

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

@@ -153,7 +153,7 @@ object LifeAccountAuthDataManager {
    * 生成营业执照上传接口请求体
    */
   fun generateAuthBusinessLicenseCommitRequest(
-    lifeAccountId: String?
+    lifeAccountId: String?, recordId: Long?
   ): HashMap<String, String?> {
     val requestMap = HashMap<String, String?>()
     requestMap["code"] = merchantAuthData.registrationCode
@@ -174,9 +174,8 @@ object LifeAccountAuthDataManager {
     requestMap["entterprise_image"] = merchantAuthData.businessLicenseObjectKey
     requestMap["data_from"] = Constant.DATA_FROM_B.toString()
     requestMap["data_type"] = merchantAuthData.merchantType.toString()
-    lifeAccountId?.let {
-      requestMap["life_account_id"] = it
-    }
+    lifeAccountId?.let { requestMap["life_account_id"] = it }
+    recordId?.let { requestMap["enterprise_auth_record_id"] = it.toString() }
     return requestMap
   }
 

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

@@ -229,25 +229,29 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
         if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_QUALIFICATION) {
           // personalLifeAccountId不为null则是由个人生活号升级为企业生活号情况
           // personalLifeAccountId为null则是直接进行企业认证情况
+          // 402接口 直接企业认证生活号id和审核id均不传 个人认证升级只传生活号id 认证修改只传审核id
           ApiService.authBusinessLicenseCommit(
             this,
             LifeAccountAuthDataManager.generateAuthBusinessLicenseCommitRequest(
-              personalLifeAccountId
+              if (isAuthModify) null else personalLifeAccountId,
+              if (isAuthModify) LifeAccountAuthDataManager.merchantAuthData.authRecordId else null
             )
           )
         } else if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_MANAGER) {
+          // 406接口 直接企业认证和认证修改不传生活号id 个人认证升级传生活号id
           if (LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_INDIVIDUAL_BUSINESS) {
             ApiService.authIndividualBusinessComplete(
               this,
               LifeAccountAuthDataManager.generateAuthIndividualBusinessCompleteRequest(
-                personalLifeAccountId
+                if (isAuthModify) null else personalLifeAccountId
               )
             )
           } else if (LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_COMMON_ENTERPRISE) {
+            // 403接口 直接企业认证和认证修改不传生活号id 个人认证升级传生活号id
             ApiService.authEnterpriseLegalIdentityCommit(
               this,
               LifeAccountAuthDataManager.generateAuthEnterpriseLegalIdentityCommitRequest(
-                personalLifeAccountId
+                if (isAuthModify) null else personalLifeAccountId
               )
             )
           }