Merge branch 'dev' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into dev

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/adapter/MerchantSwitchAdapter.kt

@@ -17,7 +17,7 @@ import com.yidian.shenghuoquan.newscontent.http.httpbean.LifeAccountItemBean
  * description: 商户切换主体
  */
 class MerchantSwitchAdapter(
-    private val curLifeAccountId: Long,
+    private val curLifeAccountId: String,
     data: List<LifeAccountItemBean.Response>? = null,
     val listener: OnItemClickListener? = null
 ) :

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

@@ -25,6 +25,6 @@ class AuthEnterpriseLegalIdentityCommitBean {
         val mobile: String,
     )
 
-    data class Response(val life_account_id: Long)
+    data class Response(val life_account_id: String)
 
 }
\ No newline at end of file

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

@@ -9,6 +9,6 @@ class AuthIndividualBusinessCompleteBean {
 
     data class Request(val record_id: Long)
 
-    data class Response(val life_account_id: Long)
+    data class Response(val life_account_id: String)
 
 }
\ No newline at end of file

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

@@ -7,5 +7,5 @@ package com.yidian.shenghuoquan.newscontent.http.httpbean
  */
 class AuthPersonalCompleteBean(val request: Request) {
     data class Request(val mobile: String, val life_account_id: Long?)
-    data class Response(val life_account_id: Long)
+    data class Response(val life_account_id: String)
 }
\ No newline at end of file

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

@@ -20,7 +20,7 @@ class GetLifeAccountInfoByIdBean {
         val legal_person: String,
         val life_account_admin_id: Long,
         val life_account_auth_status: Int,
-        val life_account_id: Long,
+        val life_account_id: String,
         val life_account_name: String,
         val life_account_status: Int,
         val life_account_type: Int,

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

@@ -7,7 +7,7 @@ class LifeAccountItemBean(var response: Response) {
         var create_time: String,
         var enterprise_audit_status: Int,
         var life_account_auth_status: Int,
-        var life_account_id: Long,
+        var life_account_id: String,
         var life_account_name: String,
         var life_account_status: Int,
         var life_account_type: Int,

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

@@ -17,7 +17,7 @@ data class AccountListDto(
 @Parcelize
 data class AccountAdmin(
   @SerializedName("life_account_id")
-  val lifeAccountId: Long? = null,
+  val lifeAccountId: String? = null,
   @SerializedName("merchant_id")
   val merchantId: Int? = null,
   @SerializedName("mobile")
@@ -37,7 +37,7 @@ data class AccountAdmin(
 @Parcelize
 data class AccountUser(
   @SerializedName("life_account_id")
-  val lifeAccountId: Long? = null,
+  val lifeAccountId: String? = null,
   @SerializedName("merchant_id")
   val merchantId: Int? = null,
   @SerializedName("mobile")

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt

@@ -8,6 +8,7 @@ import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.adapter.MerchantServiceGroupAdapter
+import com.yidian.shenghuoquan.newscontent.constant.Constant
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityMerchantCenterBinding
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IGetConfigListCallback
@@ -16,6 +17,7 @@ import com.yidian.shenghuoquan.newscontent.http.callback.IGetLifeAccountListCall
 import com.yidian.shenghuoquan.newscontent.http.httpbean.GetConfigListBean
 import com.yidian.shenghuoquan.newscontent.http.httpbean.GetLifeAccountInfoByIdBean
 import com.yidian.shenghuoquan.newscontent.http.httpbean.LifeAccountItemBean
+import com.yidian.shenghuoquan.newscontent.ui.dialog.MerchantCenterBottomHintDialog
 import com.yidian.shenghuoquan.newscontent.widget.LifeAccountLabelView
 import com.yidian.xpage.XPageManager
 
@@ -84,6 +86,22 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
 
         // 请求功能入口配置清单
         ApiService.getConfigList(this)
+
+        // 判断是否提示升级企业认证或提示认证驳回
+        if (curLifeAccount.life_account_type == Constant.TYPE_LIFE_ACCOUNT_PERSONAL) {
+            // 当前是个人生活号 提示升级
+            MerchantCenterBottomHintDialog(
+                this,
+                MerchantCenterBottomHintDialog.TYPE_AUTH_UPGRADE
+            ).show()
+        }
+        if (curLifeAccount.enterprise_audit_status == Constant.STATUS_AUDIT_REJECT) {
+            // 当前企业认证驳回 提示修改
+            MerchantCenterBottomHintDialog(
+                this,
+                MerchantCenterBottomHintDialog.TYPE_AUTH_REJECT
+            ).show()
+        }
     }
 
     override fun getConfigListSuccess(result: GetConfigListBean.Response?) {
@@ -122,11 +140,11 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
         viewBind.lvLifeAccountLabel.setLifeAccountData(data)
     }
 
-    override fun onEnterLifeAccountInfo(lifeAccountId: Long) {
+    override fun onEnterLifeAccountInfo(lifeAccountId: String) {
         // 请求生活号详情接口
         ApiService.getLifeAccountInfoById(
             this,
-            hashMapOf(Pair(PARAMS_LIFE_ACCOUNT_ID, lifeAccountId.toString()))
+            hashMapOf(Pair(PARAMS_LIFE_ACCOUNT_ID, lifeAccountId))
         )
     }
 

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantSwitchDialog.kt

@@ -19,7 +19,7 @@ import com.yidian.utils.DensityUtil
  */
 class MerchantSwitchDialog(
     context: Context,
-    private val curLifeAccountId: Long,
+    private val curLifeAccountId: String,
     val data: List<LifeAccountItemBean.Response>,
     val callback: OnMerchantSwitchCallback? = null
 ) : BaseDialog<DialogMerchantSwitchBinding>(context, R.style.merchant_switch_dialog),

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountLabelView.kt

@@ -99,7 +99,7 @@ class LifeAccountLabelView @JvmOverloads constructor(
         /**
          * 进入生活号基本信息
          */
-        fun onEnterLifeAccountInfo(lifeAccountId: Long)
+        fun onEnterLifeAccountInfo(lifeAccountId: String)
     }
 
 

Components/newscontent/src/main/res/layout/view_life_account_personal_auth_info.xml

@@ -127,6 +127,7 @@
             android:layout_height="@dimen/dp59"
             android:layout_marginTop="@dimen/dp36"
             android:background="@mipmap/icon_seal"
+            android:layout_marginEnd="@dimen/dp1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />