update 个人、企业认证接口出入参调整

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

@@ -8,6 +8,8 @@ package com.yidian.shenghuoquan.newscontent.bean
 class LifeAccountMerchantAuthData {
   var merchantType: Int = 0
   var isBusinessLicenseUpload: Boolean = false
+  var businessLicenseUrl: String? = null // 营业执照图片唯一标识
+  var businessLicenseBucket: String? = null
   var businessLicenseObjectKey: String? = null
   var registrationName: String? = null
   var registrationCode: String? = null
@@ -32,6 +34,8 @@ class LifeAccountMerchantAuthData {
   fun clearData() {
     merchantType = 0
     isBusinessLicenseUpload = false
+    businessLicenseUrl = null
+    businessLicenseBucket = null
     businessLicenseObjectKey = null
     registrationName = null
     registrationCode = null

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

@@ -10,6 +10,8 @@ class LifeAccountPersonalAuthData {
   var idCardNum: String? = null
   var phoneNum: String? = null // 法人手机号
   var occupation: String? = null
+  var idCardPortraitFaceUrl: String? = null // 身份证人像面图片唯一标识
+  var idCardNationalEmblemFaceUrl: String? = null // 身份证国徽面图片唯一标识
   var idCardPortraitFaceObjectKey: String? = null
   var idCardNationalEmblemFaceObjectKey: String? = null
   var idCardPortraitFaceBucket: String? = null
@@ -37,6 +39,8 @@ class LifeAccountPersonalAuthData {
     idCardNum = null
     phoneNum = null
     occupation = null
+    idCardPortraitFaceUrl = null
+    idCardNationalEmblemFaceUrl = null
     idCardPortraitFaceObjectKey = null
     idCardNationalEmblemFaceObjectKey = null
     idCardPortraitFaceBucket = null

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

@@ -9,24 +9,24 @@ import java.io.Serializable
  */
 class AuthAuthenticationBean(val response: Response) : Serializable {
 
-    data class Response(
-        val address: String,
-        val audit_status: Int,
-        val auth: Int,
-        val back_id_card: String,
-        val back_id_card_url: String,
-        val create_time: String,
-        val front_id_card: String,
-        val front_id_card_url: String,
-        val full_name: String,
-        val gender: String,
-        val id_card: String,
-        val issued_by: String,
-        val live_identity_status: Int,
-        val nationality: String,
-        val occupation: String,
-        val validity_end_time: String,
-        val validity_start_time: String
-    ) : Serializable
+  data class Response(
+    val address: String,
+    val audit_status: Int,
+    val auth: Int,
+    val back_image_url: String, // 身份证国徽面bucket/objectid
+    val back_id_card_url: String,
+    val create_time: String,
+    val posit_image_url: String,  // 身份证人像面bucket/objectid
+    val front_id_card_url: String,
+    val full_name: String,
+    val gender: String,
+    val id_card: String,
+    val issued_by: String,
+    val live_identity_status: Int,
+    val nationality: String,
+    val occupation: String,
+    val validity_end_time: String,
+    val validity_start_time: String
+  ) : Serializable
 
-}
+}
\ No newline at end of file

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

@@ -22,16 +22,16 @@ class AuthMerchantCheckBean : Serializable {
     val enterprice_address: String,
     val enterprice_type: String,
     val enterprise_auth_record_id: Long,
-    val entterprise_image: String,
+    val business_image_url: String, // 营业执照bucket/objectid
     val entterprise_image_url: String,
     val establishment_date: String,
     val form: String,
     val funding: String,
     val issue_date: String,
     val legal_address: String,
-    val legal_back_id_card: String,
+    val back_image_url: String, // 身份证国徽面bucket/objectid
     val legal_back_id_card_url: String,
-    val legal_front_id_card: String,
+    val posit_image_url: String, // 身份证人像面bucket/objectid
     val legal_front_id_card_url: String,
     val legal_id_card: String,
     val legal_issued_by: String,

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

@@ -50,8 +50,8 @@ object LifeAccountAuthDataManager {
     personalAuthData.realName = data.full_name
     personalAuthData.idCardNum = data.id_card
     personalAuthData.occupation = data.occupation
-    personalAuthData.idCardPortraitFaceObjectKey = data.front_id_card
-    personalAuthData.idCardNationalEmblemFaceObjectKey = data.back_id_card
+    personalAuthData.idCardPortraitFaceUrl = data.posit_image_url
+    personalAuthData.idCardNationalEmblemFaceUrl = data.back_image_url
     personalAuthData.address = data.address
     personalAuthData.nationality = data.nationality
     personalAuthData.gender = data.gender
@@ -69,12 +69,10 @@ object LifeAccountAuthDataManager {
    */
   fun generateAuthPersonalCheckRequest(): HashMap<String, String?> {
     val requestMap = HashMap<String, String?>()
-    requestMap["front_img"] = personalAuthData.idCardPortraitFaceObjectKey
-    requestMap["bak_img"] = personalAuthData.idCardNationalEmblemFaceObjectKey
-    requestMap["front_completeness"] =
-      personalAuthData.idCardPortraitFaceCompleteness.toString()
-    requestMap["bak_completeness"] =
-      personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
+    requestMap["posit_image_url"] = personalAuthData.idCardPortraitFaceUrl
+    requestMap["back_image_url"] = personalAuthData.idCardNationalEmblemFaceUrl
+    requestMap["front_completeness"] = personalAuthData.idCardPortraitFaceCompleteness.toString()
+    requestMap["bak_completeness"] = personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
     requestMap["id_card"] = personalAuthData.idCardNum
     requestMap["gender"] = personalAuthData.gender
     requestMap["name"] = personalAuthData.realName
@@ -130,7 +128,7 @@ object LifeAccountAuthDataManager {
     merchantAuthData.form = data.form
     merchantAuthData.funding = data.funding
     merchantAuthData.dateIssue = data.issue_date
-    merchantAuthData.businessLicenseObjectKey = data.entterprise_image
+    merchantAuthData.businessLicenseUrl = data.entterprise_image_url
     merchantAuthData.pers = data.pers
     personalAuthData.realName = data.legal_person
     personalAuthData.idCardNum = data.legal_id_card
@@ -141,8 +139,8 @@ object LifeAccountAuthDataManager {
     personalAuthData.issuedBy = data.legal_issued_by
     personalAuthData.validDateStart = data.legal_validity_start_time
     personalAuthData.validDateEnd = data.legal_validity_end_time
-    personalAuthData.idCardPortraitFaceObjectKey = data.legal_front_id_card
-    personalAuthData.idCardNationalEmblemFaceObjectKey = data.legal_back_id_card
+    personalAuthData.idCardPortraitFaceUrl = data.posit_image_url
+    personalAuthData.idCardNationalEmblemFaceUrl = data.back_image_url
     personalAuthData.isIDCardPortraitFaceUpload = true
     personalAuthData.isIDCardNationalEmblemFaceUpload = true
     personalAuthData.idCardPortraitFaceCompleteness = 0
@@ -171,7 +169,7 @@ object LifeAccountAuthDataManager {
     requestMap["form"] = merchantAuthData.form
     requestMap["funding"] = merchantAuthData.funding
     requestMap["issue_date"] = merchantAuthData.dateIssue
-    requestMap["entterprise_image"] = merchantAuthData.businessLicenseObjectKey
+    requestMap["entterprise_image_url"] = merchantAuthData.businessLicenseUrl
     requestMap["data_from"] = Constant.DATA_FROM_B.toString()
     requestMap["data_type"] = merchantAuthData.merchantType.toString()
     lifeAccountId?.let { requestMap["life_account_id"] = it }
@@ -185,12 +183,10 @@ object LifeAccountAuthDataManager {
   fun generateAuthIndividualBusinessIdentityCommitRequest(): HashMap<String, String?> {
     val requestMap = HashMap<String, String?>()
     requestMap["record_id"] = merchantAuthData.authRecordId.toString()
-    requestMap["front_img"] = personalAuthData.idCardPortraitFaceObjectKey
-    requestMap["bak_img"] = personalAuthData.idCardNationalEmblemFaceObjectKey
-    requestMap["front_completeness"] =
-      personalAuthData.idCardPortraitFaceCompleteness.toString()
-    requestMap["bak_completeness"] =
-      personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
+    requestMap["posit_image_url"] = personalAuthData.idCardPortraitFaceUrl
+    requestMap["back_image_url"] = personalAuthData.idCardNationalEmblemFaceUrl
+    requestMap["front_completeness"] = personalAuthData.idCardPortraitFaceCompleteness.toString()
+    requestMap["bak_completeness"] = personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
     requestMap["idcard_number"] = personalAuthData.idCardNum
     requestMap["gender"] = personalAuthData.gender
     requestMap["name"] = personalAuthData.realName
@@ -210,12 +206,10 @@ object LifeAccountAuthDataManager {
   ): HashMap<String, String?> {
     val requestMap = HashMap<String, String?>()
     requestMap["record_id"] = merchantAuthData.authRecordId.toString()
-    requestMap["front_img"] = personalAuthData.idCardPortraitFaceObjectKey
-    requestMap["bak_img"] = personalAuthData.idCardNationalEmblemFaceObjectKey
-    requestMap["front_completeness"] =
-      personalAuthData.idCardPortraitFaceCompleteness.toString()
-    requestMap["bak_completeness"] =
-      personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
+    requestMap["posit_image_url"] = personalAuthData.idCardPortraitFaceUrl
+    requestMap["back_image_url"] = personalAuthData.idCardNationalEmblemFaceUrl
+    requestMap["front_completeness"] = personalAuthData.idCardPortraitFaceCompleteness.toString()
+    requestMap["bak_completeness"] = personalAuthData.idCardNationalEmblemFaceCompleteness.toString()
     requestMap["idcard_number"] = personalAuthData.idCardNum
     requestMap["gender"] = personalAuthData.gender
     requestMap["name"] = personalAuthData.realName
@@ -225,9 +219,7 @@ object LifeAccountAuthDataManager {
     requestMap["valid_date_end"] = personalAuthData.validDateEnd
     requestMap["issued_by"] = personalAuthData.issuedBy
     requestMap["mobile"] = personalAuthData.phoneNum
-    lifeAccountId?.let {
-      requestMap["life_account_id"] = it
-    }
+    lifeAccountId?.let { requestMap["life_account_id"] = it }
     return requestMap
   }
 
@@ -237,9 +229,7 @@ object LifeAccountAuthDataManager {
   fun generateAuthIndividualBusinessCompleteRequest(lifeAccountId: String?): HashMap<String, String?> {
     val requestMap = HashMap<String, String?>()
     requestMap["record_id"] = merchantAuthData.authRecordId.toString()
-    lifeAccountId?.let {
-      requestMap["life_account_id"] = it
-    }
+    lifeAccountId?.let { requestMap["life_account_id"] = it }
     return requestMap
   }
 }

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

@@ -284,7 +284,9 @@ class LifeAccountBusinessLicenseAuthFragment :
 
   override fun onTaskSuccess(bucket: String?, objectKey: String?) {
     LifeAccountAuthDataManager.merchantAuthData.isBusinessLicenseUpload = true
+    LifeAccountAuthDataManager.merchantAuthData.businessLicenseBucket = bucket
     LifeAccountAuthDataManager.merchantAuthData.businessLicenseObjectKey = objectKey
+    LifeAccountAuthDataManager.merchantAuthData.businessLicenseUrl = "${bucket}/${objectKey}"
     // 执行营业执照OCR
     startBusinessLicenseOCR(objectKey, bucket)
   }

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

@@ -461,6 +461,7 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
               objectKey
             LifeAccountAuthDataManager.personalAuthData.idCardPortraitFaceBucket =
               bucket
+            LifeAccountAuthDataManager.personalAuthData.idCardPortraitFaceUrl = "${bucket}/${objectKey}"
           } else {
             LifeAccountAuthDataManager.personalAuthData.isIDCardNationalEmblemFaceUpload =
               true
@@ -468,6 +469,7 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
               objectKey
             LifeAccountAuthDataManager.personalAuthData.idCardNationalEmblemFaceBucket =
               bucket
+            LifeAccountAuthDataManager.personalAuthData.idCardNationalEmblemFaceUrl = "${bucket}/${objectKey}"
           }
           startIDCardOCR(face, objectKey, bucket)
         }