fix SHQBD-130 未修改商户类型不清空营业执照信息

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

@@ -154,13 +154,14 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
     // 如果有已存在的认证流程则还原进度
     authData?.let { LifeAccountAuthDataManager.generateMerchantAuthData(it) }
     authData?.data_type?.let {
-      viewBind.svMerchantType.setContentResult(
-        if (it == Constant.TYPE_INDIVIDUAL_BUSINESS) {
+      // 商户类型
+      val type = if (it == Constant.TYPE_INDIVIDUAL_BUSINESS) {
         Constant.ITEM_INDIVIDUAL_BUSINESSES
       } else {
         Constant.ITEM_COMMON_ENTERPRISE
       }
-      )
+      viewBind.svMerchantType.setContentResult(type)
+      lastSelectedMerchantType = type
     }
     val bundle = Bundle()
     bundle.putSerializable(LifeAccountBusinessLicenseAuthFragment.EXTRA_AUTH_DATA, authData)
@@ -242,18 +243,24 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
   }
 
   override fun onItemClick(view: View, position: Int, data: BottomSelectBean) {
-    // 未修改商户类型不清空信息
-    if (lastSelectedMerchantType == data.item) return
-    lastSelectedMerchantType = data.item
-    // 更换商户类型，清空营业执照图片、清空注册名称和注册码
-    (fragmentList[0] as LifeAccountBusinessLicenseAuthFragment).clearBusinessLicenseInfo()
+    // 未修改商户类型不清空营业执照信息
+    if (lastSelectedMerchantType == data.item) {
+      return
+    } else {
       // 回显选择的商户类型
       viewBind.svMerchantType.setContentResult(data.item)
       // 保存选择的商户类型
       LifeAccountAuthDataManager.merchantAuthData.merchantType =
         if (data.item == Constant.ITEM_INDIVIDUAL_BUSINESSES) Constant.TYPE_INDIVIDUAL_BUSINESS else Constant.TYPE_COMMON_ENTERPRISE
+      // 第一次选择商户类型不清空营业执照信息
+      if (lastSelectedMerchantType != null) {
+        // 更换商户类型，清空营业执照图片、清空注册名称和注册码
+        (fragmentList[0] as LifeAccountBusinessLicenseAuthFragment).clearBusinessLicenseInfo()
+      }
       // 检查下一步条件
       checkNextCondition()
+      lastSelectedMerchantType = data.item
+    }
   }
 
   override fun authBusinessLicenseCommitSuccess(result: AuthBusinessLicenseCommitBean.Response?) {