Commit 43779dab authored by yinjiacheng's avatar yinjiacheng

update 生活号id由Long类型改为String类型

parent 219c89d8
...@@ -17,7 +17,7 @@ import com.yidian.shenghuoquan.newscontent.http.httpbean.LifeAccountItemBean ...@@ -17,7 +17,7 @@ import com.yidian.shenghuoquan.newscontent.http.httpbean.LifeAccountItemBean
* description: 商户切换主体 * description: 商户切换主体
*/ */
class MerchantSwitchAdapter( class MerchantSwitchAdapter(
private val curLifeAccountId: Long, private val curLifeAccountId: String,
data: List<LifeAccountItemBean.Response>? = null, data: List<LifeAccountItemBean.Response>? = null,
val listener: OnItemClickListener? = null val listener: OnItemClickListener? = null
) : ) :
......
...@@ -25,6 +25,6 @@ class AuthEnterpriseLegalIdentityCommitBean { ...@@ -25,6 +25,6 @@ class AuthEnterpriseLegalIdentityCommitBean {
val mobile: String, 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
...@@ -9,6 +9,6 @@ class AuthIndividualBusinessCompleteBean { ...@@ -9,6 +9,6 @@ class AuthIndividualBusinessCompleteBean {
data class Request(val record_id: Long) 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
...@@ -7,5 +7,5 @@ package com.yidian.shenghuoquan.newscontent.http.httpbean ...@@ -7,5 +7,5 @@ package com.yidian.shenghuoquan.newscontent.http.httpbean
*/ */
class AuthPersonalCompleteBean(val request: Request) { class AuthPersonalCompleteBean(val request: Request) {
data class Request(val mobile: String, val life_account_id: Long?) 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
...@@ -20,7 +20,7 @@ class GetLifeAccountInfoByIdBean { ...@@ -20,7 +20,7 @@ class GetLifeAccountInfoByIdBean {
val legal_person: String, val legal_person: String,
val life_account_admin_id: Long, val life_account_admin_id: Long,
val life_account_auth_status: Int, val life_account_auth_status: Int,
val life_account_id: Long, val life_account_id: String,
val life_account_name: String, val life_account_name: String,
val life_account_status: Int, val life_account_status: Int,
val life_account_type: Int, val life_account_type: Int,
......
...@@ -7,7 +7,7 @@ class LifeAccountItemBean(var response: Response) { ...@@ -7,7 +7,7 @@ class LifeAccountItemBean(var response: Response) {
var create_time: String, var create_time: String,
var enterprise_audit_status: Int, var enterprise_audit_status: Int,
var life_account_auth_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_name: String,
var life_account_status: Int, var life_account_status: Int,
var life_account_type: Int, var life_account_type: Int,
......
...@@ -17,7 +17,7 @@ data class AccountListDto( ...@@ -17,7 +17,7 @@ data class AccountListDto(
@Parcelize @Parcelize
data class AccountAdmin( data class AccountAdmin(
@SerializedName("life_account_id") @SerializedName("life_account_id")
val lifeAccountId: Long? = null, val lifeAccountId: String? = null,
@SerializedName("merchant_id") @SerializedName("merchant_id")
val merchantId: Int? = null, val merchantId: Int? = null,
@SerializedName("mobile") @SerializedName("mobile")
...@@ -37,7 +37,7 @@ data class AccountAdmin( ...@@ -37,7 +37,7 @@ data class AccountAdmin(
@Parcelize @Parcelize
data class AccountUser( data class AccountUser(
@SerializedName("life_account_id") @SerializedName("life_account_id")
val lifeAccountId: Long? = null, val lifeAccountId: String? = null,
@SerializedName("merchant_id") @SerializedName("merchant_id")
val merchantId: Int? = null, val merchantId: Int? = null,
@SerializedName("mobile") @SerializedName("mobile")
......
...@@ -142,11 +142,11 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), ...@@ -142,11 +142,11 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
viewBind.lvLifeAccountLabel.setLifeAccountData(data) viewBind.lvLifeAccountLabel.setLifeAccountData(data)
} }
override fun onEnterLifeAccountInfo(lifeAccountId: Long) { override fun onEnterLifeAccountInfo(lifeAccountId: String) {
// 请求生活号详情接口 // 请求生活号详情接口
ApiService.getLifeAccountInfoById( ApiService.getLifeAccountInfoById(
this, this,
hashMapOf(Pair(PARAMS_LIFE_ACCOUNT_ID, lifeAccountId.toString())) hashMapOf(Pair(PARAMS_LIFE_ACCOUNT_ID, lifeAccountId))
) )
} }
......
...@@ -19,7 +19,7 @@ import com.yidian.utils.DensityUtil ...@@ -19,7 +19,7 @@ import com.yidian.utils.DensityUtil
*/ */
class MerchantSwitchDialog( class MerchantSwitchDialog(
context: Context, context: Context,
private val curLifeAccountId: Long, private val curLifeAccountId: String,
val data: List<LifeAccountItemBean.Response>, val data: List<LifeAccountItemBean.Response>,
val callback: OnMerchantSwitchCallback? = null val callback: OnMerchantSwitchCallback? = null
) : BaseDialog<DialogMerchantSwitchBinding>(context, R.style.merchant_switch_dialog), ) : BaseDialog<DialogMerchantSwitchBinding>(context, R.style.merchant_switch_dialog),
......
...@@ -99,7 +99,7 @@ class LifeAccountLabelView @JvmOverloads constructor( ...@@ -99,7 +99,7 @@ class LifeAccountLabelView @JvmOverloads constructor(
/** /**
* 进入生活号基本信息 * 进入生活号基本信息
*/ */
fun onEnterLifeAccountInfo(lifeAccountId: Long) fun onEnterLifeAccountInfo(lifeAccountId: String)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment