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
ef3e105f
authored
Nov 17, 2020
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
退单
parent
1273b075
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
1 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/BuyVoucherActivityQuery.java
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/user/CommuneExtBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/BuyVoucherActivityQuery.java
View file @
ef3e105f
...
@@ -21,7 +21,7 @@ public class BuyVoucherActivityQuery extends AbstractPagedQuery {
...
@@ -21,7 +21,7 @@ public class BuyVoucherActivityQuery extends AbstractPagedQuery {
private
Date
createdTimeStart
;
//
private
Date
createdTimeStart
;
//
private
Date
createdTimeEnd
;
private
Date
createdTimeEnd
;
private
Integer
buyAndUsed
;
//是否买了并使用了券1:有效 0失效
private
Integer
buyAndUsed
;
//是否买了并使用了券1:有效 0失效
private
String
regionCode
;
//区域
0
-全区域,100-上海 ,110-广州,120-北京
private
String
regionCode
;
//区域
1
-全区域,100-上海 ,110-广州,120-北京
public
Integer
getId
()
{
public
Integer
getId
()
{
return
id
;
return
id
;
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/AbstractOpOrderBean.java
View file @
ef3e105f
...
@@ -277,6 +277,31 @@ public abstract class AbstractOpOrderBean {
...
@@ -277,6 +277,31 @@ public abstract class AbstractOpOrderBean {
/**一种折扣*/
/**一种折扣*/
private
BigDecimal
discountRate
;
private
BigDecimal
discountRate
;
/**退款按钮是否显示 */
private
Integer
canRefund
;
/**打球时间*/
private
Date
playDate
;
/**订单类型*/
private
int
orderCategory
;
public
int
getOrderCategory
()
{
return
orderCategory
;
}
public
void
setOrderCategory
(
int
orderCategory
)
{
this
.
orderCategory
=
orderCategory
;
}
public
Date
getPlayDate
()
{
return
playDate
;
}
public
void
setPlayDate
(
Date
playDate
)
{
this
.
playDate
=
playDate
;
}
public
long
getOrderNo
()
{
public
long
getOrderNo
()
{
return
orderNo
;
return
orderNo
;
}
}
...
@@ -285,6 +310,14 @@ public abstract class AbstractOpOrderBean {
...
@@ -285,6 +310,14 @@ public abstract class AbstractOpOrderBean {
return
userName
;
return
userName
;
}
}
public
Integer
getCanRefund
()
{
return
canRefund
;
}
public
void
setCanRefund
(
Integer
canRefund
)
{
this
.
canRefund
=
canRefund
;
}
public
Integer
getQuantity
()
{
public
Integer
getQuantity
()
{
return
quantity
;
return
quantity
;
}
}
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/CommuneExtBean.java
View file @
ef3e105f
...
@@ -148,6 +148,7 @@ public class CommuneExtBean implements java.io.Serializable {
...
@@ -148,6 +148,7 @@ public class CommuneExtBean implements java.io.Serializable {
private
String
labels
;
private
String
labels
;
public
Integer
getId
()
{
public
Integer
getId
()
{
return
id
;
return
id
;
}
}
...
...
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