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
7cb03f53
authored
Feb 07, 2018
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add the vipmemberprice check
parent
c7f44000
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
59 additions
and
5 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/AbstractOrderBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/CourseOrderResourceBean.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/order/AbstractOrderBean.java
View file @
7cb03f53
...
...
@@ -102,6 +102,10 @@ public abstract class AbstractOrderBean<T> extends AbstractBean {
private
boolean
canDelete
;
private
BigDecimal
vipmemberDiscount
;
private
BigDecimal
vipmemberDiscountRate
;
// ------------------
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
...
...
@@ -580,4 +584,21 @@ public abstract class AbstractOrderBean<T> extends AbstractBean {
this
.
canDelete
=
canDelete
;
}
public
BigDecimal
getVipmemberDiscount
()
{
return
vipmemberDiscount
;
}
public
void
setVipmemberDiscount
(
BigDecimal
vipmemberDiscount
)
{
this
.
vipmemberDiscount
=
vipmemberDiscount
;
}
public
BigDecimal
getVipmemberDiscountRate
()
{
return
vipmemberDiscountRate
;
}
public
void
setVipmemberDiscountRate
(
BigDecimal
vipmemberDiscountRate
)
{
this
.
vipmemberDiscountRate
=
vipmemberDiscountRate
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/CourseOrderResourceBean.java
View file @
7cb03f53
...
...
@@ -67,8 +67,12 @@ public class CourseOrderResourceBean {
*/
private
Double
memberCashRebate
;
/**vip会员首次优惠*/
private
Double
vipFirstReduction
;
/**vip会员随机最低优惠*/
private
Double
vipMinRandom
;
/**vip会员随机最高优惠*/
private
Double
vipMaxRandom
;
public
String
getProductName
()
{
return
productName
;
...
...
@@ -365,4 +369,36 @@ public class CourseOrderResourceBean {
this
.
memberCashRebate
=
memberCashRebate
;
}
public
Double
getVipFirstReduction
()
{
return
vipFirstReduction
;
}
public
void
setVipFirstReduction
(
Double
vipFirstReduction
)
{
this
.
vipFirstReduction
=
vipFirstReduction
;
}
public
Double
getVipMinRandom
()
{
return
vipMinRandom
;
}
public
void
setVipMinRandom
(
Double
vipMinRandom
)
{
this
.
vipMinRandom
=
vipMinRandom
;
}
public
Double
getVipMaxRandom
()
{
return
vipMaxRandom
;
}
public
void
setVipMaxRandom
(
Double
vipMaxRandom
)
{
this
.
vipMaxRandom
=
vipMaxRandom
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/UserBean.java
View file @
7cb03f53
...
...
@@ -3,7 +3,6 @@ package com.ctrip.fun.common.vo.user;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
...
...
@@ -907,6 +906,4 @@ public class UserBean implements Serializable {
this
.
hobby
=
hobby
;
}
}
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