Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-common
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
2
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
447c5ed6
authored
Feb 06, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.6.6' of 192.168.10.6:caosy/fun-common into f-6.6.6
parents
85297dcb
c7f44000
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
60 additions
and
0 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/LoginResultBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/UserBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/WeChatUserResultBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/LoginResultBean.java
View file @
447c5ed6
...
@@ -241,6 +241,11 @@ public class LoginResultBean implements Serializable {
...
@@ -241,6 +241,11 @@ public class LoginResultBean implements Serializable {
private
String
vipmemberImgUrl
;
private
String
vipmemberImgUrl
;
/**vip是否优惠过*/
private
int
vipmemberDiscounted
;
/**vip随机优惠百分比*/
private
BigDecimal
vipmemberDiscountRate
;
public
String
getAddress
()
{
public
String
getAddress
()
{
return
address
;
return
address
;
}
}
...
@@ -699,5 +704,20 @@ public class LoginResultBean implements Serializable {
...
@@ -699,5 +704,20 @@ public class LoginResultBean implements Serializable {
this
.
vipmemberImgUrl
=
vipmemberImgUrl
;
this
.
vipmemberImgUrl
=
vipmemberImgUrl
;
}
}
public
int
getVipmemberDiscounted
()
{
return
vipmemberDiscounted
;
}
public
void
setVipmemberDiscounted
(
int
vipmemberDiscounted
)
{
this
.
vipmemberDiscounted
=
vipmemberDiscounted
;
}
public
BigDecimal
getVipmemberDiscountRate
()
{
return
vipmemberDiscountRate
;
}
public
void
setVipmemberDiscountRate
(
BigDecimal
vipmemberDiscountRate
)
{
this
.
vipmemberDiscountRate
=
vipmemberDiscountRate
;
}
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/UserBean.java
View file @
447c5ed6
...
@@ -255,6 +255,11 @@ public class UserBean implements Serializable {
...
@@ -255,6 +255,11 @@ public class UserBean implements Serializable {
/**vip标志小图标*/
/**vip标志小图标*/
private
String
vipmemberImgUrl
;
private
String
vipmemberImgUrl
;
/**vip是否优惠过*/
private
int
vipmemberDiscounted
;
/**vip随机优惠百分比*/
private
BigDecimal
vipmemberDiscountRate
;
/**tee*/
/**tee*/
private
Integer
tee
;
private
Integer
tee
;
...
@@ -806,6 +811,22 @@ public class UserBean implements Serializable {
...
@@ -806,6 +811,22 @@ public class UserBean implements Serializable {
this
.
vipmemberImgUrl
=
vipmemberImgUrl
;
this
.
vipmemberImgUrl
=
vipmemberImgUrl
;
}
}
public
int
getVipmemberDiscounted
()
{
return
vipmemberDiscounted
;
}
public
void
setVipmemberDiscounted
(
int
vipmemberDiscounted
)
{
this
.
vipmemberDiscounted
=
vipmemberDiscounted
;
}
public
BigDecimal
getVipmemberDiscountRate
()
{
return
vipmemberDiscountRate
;
}
public
void
setVipmemberDiscountRate
(
BigDecimal
vipmemberDiscountRate
)
{
this
.
vipmemberDiscountRate
=
vipmemberDiscountRate
;
}
public
Integer
getTee
()
{
public
Integer
getTee
()
{
return
tee
;
return
tee
;
}
}
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/WeChatUserResultBean.java
View file @
447c5ed6
...
@@ -112,6 +112,12 @@ public class WeChatUserResultBean implements Serializable {
...
@@ -112,6 +112,12 @@ public class WeChatUserResultBean implements Serializable {
* 玩家俱乐部会员等级图标
* 玩家俱乐部会员等级图标
*/
*/
private
String
vipGradeImgUrl
;
private
String
vipGradeImgUrl
;
/**vip是否优惠过*/
private
int
vipmemberDiscounted
;
/**vip随机优惠百分比*/
private
BigDecimal
vipmemberDiscountRate
;
/**
/**
* 用户积分
* 用户积分
*/
*/
...
@@ -351,6 +357,19 @@ public class WeChatUserResultBean implements Serializable {
...
@@ -351,6 +357,19 @@ public class WeChatUserResultBean implements Serializable {
public
void
setVipGradeImgUrl
(
String
vipGradeImgUrl
)
{
public
void
setVipGradeImgUrl
(
String
vipGradeImgUrl
)
{
this
.
vipGradeImgUrl
=
vipGradeImgUrl
;
this
.
vipGradeImgUrl
=
vipGradeImgUrl
;
}
}
public
int
getVipmemberDiscounted
()
{
return
vipmemberDiscounted
;
}
public
void
setVipmemberDiscounted
(
int
vipmemberDiscounted
)
{
this
.
vipmemberDiscounted
=
vipmemberDiscounted
;
}
public
BigDecimal
getVipmemberDiscountRate
()
{
return
vipmemberDiscountRate
;
}
public
void
setVipmemberDiscountRate
(
BigDecimal
vipmemberDiscountRate
)
{
this
.
vipmemberDiscountRate
=
vipmemberDiscountRate
;
}
public
int
getIntegral
()
{
public
int
getIntegral
()
{
return
integral
;
return
integral
;
}
}
...
...
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