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
* description: 商户切换主体
*/
class MerchantSwitchAdapter(
private val curLifeAccountId: Long,
private val curLifeAccountId: String,
data: List<LifeAccountItemBean.Response>? = null,
val listener: OnItemClickListener? = null
) :
......
......@@ -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
......@@ -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
......@@ -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
......@@ -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,
......
......@@ -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,
......
......@@ -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")
......
......@@ -142,11 +142,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))
)
}
......
......@@ -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),
......
......@@ -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