Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
ShenghuoquanBusiness
Commits
43779dab
Commit
43779dab
authored
Jun 16, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update 生活号id由Long类型改为String类型
parent
219c89d8
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
12 additions
and
12 deletions
+12
-12
MerchantSwitchAdapter.kt
...shenghuoquan/newscontent/adapter/MerchantSwitchAdapter.kt
+1
-1
AuthEnterpriseLegalIdentityCommitBean.kt
...nt/http/httpbean/AuthEnterpriseLegalIdentityCommitBean.kt
+1
-1
AuthIndividualBusinessCompleteBean.kt
...ntent/http/httpbean/AuthIndividualBusinessCompleteBean.kt
+1
-1
AuthPersonalCompleteBean.kt
...uan/newscontent/http/httpbean/AuthPersonalCompleteBean.kt
+1
-1
GetLifeAccountInfoByIdBean.kt
...n/newscontent/http/httpbean/GetLifeAccountInfoByIdBean.kt
+1
-1
LifeAccountItemBean.kt
...ghuoquan/newscontent/http/httpbean/LifeAccountItemBean.kt
+1
-1
AccountListDto.kt
...shenghuoquan/newscontent/personnel/bean/AccountListDto.kt
+2
-2
MerchantCenterActivity.kt
...nghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
+2
-2
MerchantSwitchDialog.kt
...henghuoquan/newscontent/ui/center/MerchantSwitchDialog.kt
+1
-1
LifeAccountLabelView.kt
...n/shenghuoquan/newscontent/widget/LifeAccountLabelView.kt
+1
-1
No files found.
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/adapter/MerchantSwitchAdapter.kt
View file @
43779dab
...
...
@@ -17,7 +17,7 @@ import com.yidian.shenghuoquan.newscontent.http.httpbean.LifeAccountItemBean
* description: 商户切换主体
*/
class
MerchantSwitchAdapter
(
private
val
curLifeAccountId
:
Lo
ng
,
private
val
curLifeAccountId
:
Stri
ng
,
data
:
List
<
LifeAccountItemBean
.
Response
>?
=
null
,
val
listener
:
OnItemClickListener
?
=
null
)
:
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/AuthEnterpriseLegalIdentityCommitBean.kt
View file @
43779dab
...
...
@@ -25,6 +25,6 @@ class AuthEnterpriseLegalIdentityCommitBean {
val
mobile
:
String
,
)
data class
Response
(
val
life_account_id
:
Lo
ng
)
data class
Response
(
val
life_account_id
:
Stri
ng
)
}
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/AuthIndividualBusinessCompleteBean.kt
View file @
43779dab
...
...
@@ -9,6 +9,6 @@ class AuthIndividualBusinessCompleteBean {
data class
Request
(
val
record_id
:
Long
)
data class
Response
(
val
life_account_id
:
Lo
ng
)
data class
Response
(
val
life_account_id
:
Stri
ng
)
}
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/AuthPersonalCompleteBean.kt
View file @
43779dab
...
...
@@ -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
:
Lo
ng
)
data class
Response
(
val
life_account_id
:
Stri
ng
)
}
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/GetLifeAccountInfoByIdBean.kt
View file @
43779dab
...
...
@@ -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
:
Lo
ng
,
val
life_account_id
:
Stri
ng
,
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
View file @
43779dab
...
...
@@ -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
:
Lo
ng
,
var
life_account_id
:
Stri
ng
,
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
View file @
43779dab
...
...
@@ -17,7 +17,7 @@ data class AccountListDto(
@Parcelize
data class
AccountAdmin
(
@SerializedName
(
"life_account_id"
)
val
lifeAccountId
:
Lo
ng
?
=
null
,
val
lifeAccountId
:
Stri
ng
?
=
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
:
Lo
ng
?
=
null
,
val
lifeAccountId
:
Stri
ng
?
=
null
,
@SerializedName
(
"merchant_id"
)
val
merchantId
:
Int
?
=
null
,
@SerializedName
(
"mobile"
)
...
...
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
View file @
43779dab
...
...
@@ -142,11 +142,11 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
viewBind
.
lvLifeAccountLabel
.
setLifeAccountData
(
data
)
}
override
fun
onEnterLifeAccountInfo
(
lifeAccountId
:
Lo
ng
)
{
override
fun
onEnterLifeAccountInfo
(
lifeAccountId
:
Stri
ng
)
{
// 请求生活号详情接口
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
View file @
43779dab
...
...
@@ -19,7 +19,7 @@ import com.yidian.utils.DensityUtil
*/
class
MerchantSwitchDialog
(
context
:
Context
,
private
val
curLifeAccountId
:
Lo
ng
,
private
val
curLifeAccountId
:
Stri
ng
,
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
View file @
43779dab
...
...
@@ -99,7 +99,7 @@ class LifeAccountLabelView @JvmOverloads constructor(
/**
* 进入生活号基本信息
*/
fun
onEnterLifeAccountInfo
(
lifeAccountId
:
Lo
ng
)
fun
onEnterLifeAccountInfo
(
lifeAccountId
:
Stri
ng
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment