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
6a37b545
authored
Feb 09, 2018
by
unknown
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
79517b77
0f3dbe15
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
1 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/product/AggregationResourceBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/product/AsmCourseresourceBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/product/AggregationResourceBean.java
View file @
6a37b545
...
...
@@ -95,7 +95,12 @@ public class AggregationResourceBean {
* 会员价格
*/
private
Double
memberPrice
;
/**
*
*/
private
Double
vipFirstReduction
;
private
Double
vipMinRandom
;
private
Double
vipMaxRandom
;
/**
* 会员返现
*/
...
...
@@ -399,5 +404,29 @@ public class AggregationResourceBean {
public
void
setCommuneMinus
(
Double
communeMinus
)
{
this
.
communeMinus
=
communeMinus
;
}
public
Double
getVipFirstReduction
()
{
return
vipFirstReduction
;
}
public
Double
getVipMinRandom
()
{
return
vipMinRandom
;
}
public
Double
getVipMaxRandom
()
{
return
vipMaxRandom
;
}
public
void
setVipFirstReduction
(
Double
vipFirstReduction
)
{
this
.
vipFirstReduction
=
vipFirstReduction
;
}
public
void
setVipMinRandom
(
Double
vipMinRandom
)
{
this
.
vipMinRandom
=
vipMinRandom
;
}
public
void
setVipMaxRandom
(
Double
vipMaxRandom
)
{
this
.
vipMaxRandom
=
vipMaxRandom
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/product/AsmCourseresourceBean.java
View file @
6a37b545
...
...
@@ -80,6 +80,21 @@ public class AsmCourseresourceBean implements java.io.Serializable {
*/
private
double
cashRebate
;
private
double
vipSaveAmount
;
/**
* vip首单立减
*/
private
double
vipFirstReduction
;
/**
* vip随机立减最小值
*/
private
double
vipMinRandom
;
/**
* vip随机立减最大值
*/
private
double
vipMaxRandom
;
// V5.3.2添加
...
...
@@ -577,5 +592,23 @@ public class AsmCourseresourceBean implements java.io.Serializable {
public
void
setVipSaveAmount
(
double
vipSaveAmount
)
{
this
.
vipSaveAmount
=
vipSaveAmount
;
}
public
double
getVipFirstReduction
()
{
return
vipFirstReduction
;
}
public
double
getVipMinRandom
()
{
return
vipMinRandom
;
}
public
double
getVipMaxRandom
()
{
return
vipMaxRandom
;
}
public
void
setVipFirstReduction
(
double
vipFirstReduction
)
{
this
.
vipFirstReduction
=
vipFirstReduction
;
}
public
void
setVipMinRandom
(
double
vipMinRandom
)
{
this
.
vipMinRandom
=
vipMinRandom
;
}
public
void
setVipMaxRandom
(
double
vipMaxRandom
)
{
this
.
vipMaxRandom
=
vipMaxRandom
;
}
}
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