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
fd96dd0c
authored
Mar 16, 2021
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
部分退款
parent
1803686e
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
93 additions
and
2 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherRegionCodeEnum.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherTypeCodeEnum.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VourcherUsedEnum.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/CourseOrderListExcelBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/EventActivityOrderListExcelBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherRegionCodeEnum.java
View file @
fd96dd0c
...
...
@@ -18,6 +18,10 @@ public enum VoucherRegionCodeEnum {
*/
BEIJING
(
"120"
,
"北京"
),
/**
* 俱乐部
*/
CLUB
(
"130"
,
"俱乐部"
),
/**
* 不限
*/
NOLIMIT
(
"1"
,
"全国"
);
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherTypeCodeEnum.java
View file @
fd96dd0c
...
...
@@ -8,11 +8,11 @@ public enum VoucherTypeCodeEnum {
/**
* 正常卷
*/
NORMAL
(
1
,
"正常
卷
"
),
NORMAL
(
1
,
"正常
劵
"
),
/**
* 体验卷
*/
EXPERIENCR
(
2
,
"体验
卷
"
);
EXPERIENCR
(
2
,
"体验
劵
"
);
private
Integer
value
;
private
String
msg
;
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VourcherUsedEnum.java
View file @
fd96dd0c
...
...
@@ -8,6 +8,7 @@ import java.util.Map;
* @date: 2014-08-26
*/
public
enum
VourcherUsedEnum
{
LOCK
(
2
,
"已锁定"
),
USED
(
1
,
"已使用"
),
UNUSED
(
0
,
"未使用"
);
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/CourseOrderListExcelBean.java
View file @
fd96dd0c
...
...
@@ -4,6 +4,8 @@ import java.math.BigDecimal;
import
java.util.Date
;
import
java.util.List
;
import
com.ctrip.fun.common.vo.basic.VoucherBean
;
public
class
CourseOrderListExcelBean
extends
CourseOrderListBean
{
/** 注册时间. */
...
...
@@ -66,6 +68,31 @@ public class CourseOrderListExcelBean extends CourseOrderListBean {
private
boolean
isDelayOrder
;
/**
* 劵数量
*/
private
Integer
voucherCount
;
/**
* 劵使用的情况
*/
private
String
voucherIDList
;
/**
* 劵名称
*/
private
List
<
String
>
voucherList
;
public
List
<
String
>
getVoucherList
()
{
return
voucherList
;
}
public
void
setVoucherList
(
List
<
String
>
voucherList
)
{
this
.
voucherList
=
voucherList
;
}
public
Date
getRegisterTime
()
{
return
registerTime
;
}
...
...
@@ -200,5 +227,25 @@ public class CourseOrderListExcelBean extends CourseOrderListBean {
this
.
isDelayOrder
=
isDelayOrder
;
}
public
Integer
getVoucherCount
()
{
return
voucherCount
;
}
public
void
setVoucherCount
(
Integer
voucherCount
)
{
this
.
voucherCount
=
voucherCount
;
}
public
String
getVoucherIDList
()
{
return
voucherIDList
;
}
public
void
setVoucherIDList
(
String
voucherIDList
)
{
this
.
voucherIDList
=
voucherIDList
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/EventActivityOrderListExcelBean.java
View file @
fd96dd0c
...
...
@@ -106,6 +106,21 @@ public class EventActivityOrderListExcelBean extends EventActivityOrderListBean
private
String
platform
;
/**
* 劵数量
*/
private
Integer
voucherCount
;
/**
* 劵使用的情况
*/
private
String
voucherIDList
;
/**
* 劵名称
*/
private
List
<
String
>
voucherList
;
public
String
getUid
()
{
return
uid
;
}
...
...
@@ -323,4 +338,28 @@ public class EventActivityOrderListExcelBean extends EventActivityOrderListBean
this
.
platform
=
platform
;
}
public
Integer
getVoucherCount
()
{
return
voucherCount
;
}
public
void
setVoucherCount
(
Integer
voucherCount
)
{
this
.
voucherCount
=
voucherCount
;
}
public
String
getVoucherIDList
()
{
return
voucherIDList
;
}
public
void
setVoucherIDList
(
String
voucherIDList
)
{
this
.
voucherIDList
=
voucherIDList
;
}
public
List
<
String
>
getVoucherList
()
{
return
voucherList
;
}
public
void
setVoucherList
(
List
<
String
>
voucherList
)
{
this
.
voucherList
=
voucherList
;
}
}
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