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
79517b77
authored
Feb 09, 2018
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add the vipmemberdiscount to orderpay
parent
ac5c7611
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
50 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/AbstractOpOrderBean.java
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/order/AbstractOpOrderBean.java
View file @
79517b77
...
...
@@ -272,6 +272,11 @@ public abstract class AbstractOpOrderBean {
private
Boolean
onlineOrderFlag
;
/**正常下单后优惠的价格,不是一开始就知道的 优惠价格*/
private
BigDecimal
discountAfterOrderAmount
;
/**一种折扣*/
private
BigDecimal
discountRate
;
public
long
getOrderNo
()
{
return
orderNo
;
}
...
...
@@ -790,4 +795,20 @@ public abstract class AbstractOpOrderBean {
this
.
onlineOrderFlag
=
onlineOrderFlag
;
}
public
BigDecimal
getDiscountAfterOrderAmount
()
{
return
discountAfterOrderAmount
;
}
public
void
setDiscountAfterOrderAmount
(
BigDecimal
discountAfterOrderAmount
)
{
this
.
discountAfterOrderAmount
=
discountAfterOrderAmount
;
}
public
BigDecimal
getDiscountRate
()
{
return
discountRate
;
}
public
void
setDiscountRate
(
BigDecimal
discountRate
)
{
this
.
discountRate
=
discountRate
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/AbstractOrderBean.java
View file @
79517b77
...
...
@@ -102,9 +102,10 @@ public abstract class AbstractOrderBean<T> extends AbstractBean {
private
boolean
canDelete
;
private
BigDecimal
vipmemberDiscount
;
private
BigDecimal
vipmemberDiscountRate
;
/**正常下单后优惠的价格,不是一开始就知道的 优惠价格*/
private
BigDecimal
discountAfterOrderAmount
;
/**一种折扣*/
private
BigDecimal
discountRate
;
// ------------------
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
...
...
@@ -584,21 +585,20 @@ public abstract class AbstractOrderBean<T> extends AbstractBean {
this
.
canDelete
=
canDelete
;
}
public
BigDecimal
get
VipmemberDisc
ount
()
{
return
vipmemberDisc
ount
;
public
BigDecimal
get
DiscountAfterOrderAm
ount
()
{
return
discountAfterOrderAm
ount
;
}
public
void
set
VipmemberDiscount
(
BigDecimal
vipmemberDisc
ount
)
{
this
.
vipmemberDiscount
=
vipmemberDisc
ount
;
public
void
set
DiscountAfterOrderAmount
(
BigDecimal
discountAfterOrderAm
ount
)
{
this
.
discountAfterOrderAmount
=
discountAfterOrderAm
ount
;
}
public
BigDecimal
get
Vipmember
DiscountRate
()
{
return
vipmemberD
iscountRate
;
public
BigDecimal
getDiscountRate
()
{
return
d
iscountRate
;
}
public
void
set
VipmemberDiscountRate
(
BigDecimal
vipmemberD
iscountRate
)
{
this
.
vipmemberDiscountRate
=
vipmemberD
iscountRate
;
public
void
set
DiscountRate
(
BigDecimal
d
iscountRate
)
{
this
.
discountRate
=
d
iscountRate
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/CourseOrderResourceBean.java
View file @
79517b77
...
...
@@ -67,12 +67,6 @@ public class CourseOrderResourceBean {
*/
private
Double
memberCashRebate
;
/**vip会员首次优惠*/
private
Double
vipFirstReduction
;
/**vip会员随机最低优惠*/
private
Double
vipMinRandom
;
/**vip会员随机最高优惠*/
private
Double
vipMaxRandom
;
public
String
getProductName
()
{
return
productName
;
...
...
@@ -369,36 +363,4 @@ 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
;
}
}
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