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
883cddac
authored
Feb 22, 2023
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
抵扣劵领取日起
parent
8f31f60e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
127 additions
and
2 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/TimeTypeEnum.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherRuleBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherRuleQuery.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherRuleVO.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/TimeTypeEnum.java
0 → 100644
View file @
883cddac
package
com
.
ctrip
.
fun
.
common
.
vo
.
basic
;
import
java.util.HashMap
;
import
java.util.Map
;
public
enum
TimeTypeEnum
{
TIME_SLOT
(
1
,
"时间段"
),
RECEIVE_TIME
(
2
,
"领取日起"
);
private
int
value
;
private
String
msg
;
private
static
Map
<
Integer
,
TimeTypeEnum
>
map
=
new
HashMap
<
Integer
,
TimeTypeEnum
>();
static
{
for
(
TimeTypeEnum
it
:
TimeTypeEnum
.
values
())
{
map
.
put
(
it
.
value
,
it
);
}
}
TimeTypeEnum
(
int
value
,
String
msg
)
{
this
.
value
=
value
;
this
.
msg
=
msg
;
}
public
int
getValue
()
{
return
value
;
}
public
void
setValue
(
int
value
)
{
this
.
value
=
value
;
}
public
String
getMsg
()
{
return
msg
;
}
public
void
setMsg
(
String
msg
)
{
this
.
msg
=
msg
;
}
public
static
TimeTypeEnum
valueOf
(
int
value
)
{
return
map
.
get
(
value
);
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherRuleBean.java
View file @
883cddac
...
...
@@ -201,8 +201,26 @@ public class VoucherRuleBean implements java.io.Serializable {
private
String
percent
;
private
int
canFreeReceive
;
//判断券是可以免费领取
/**
* 发放时间类型
* 1 时间段 2领取日起
*/
private
int
timeType
;
/**
* 领取日时间
*/
private
int
timeDay
;
/**
* 发放时间类型msg
*/
private
String
timeTypeMsg
;
@SuppressWarnings
(
"rawtypes"
)
@SuppressWarnings
(
"rawtypes"
)
public
AbstractRuleConditionBean
getRuleCondition
()
{
ObjectMapper
mapper
=
new
ObjectMapper
();
...
...
@@ -527,6 +545,27 @@ public class VoucherRuleBean implements java.io.Serializable {
this
.
canFreeReceive
=
canFreeReceive
;
}
public
int
getTimeType
()
{
return
timeType
;
}
public
void
setTimeType
(
int
timeType
)
{
this
.
timeType
=
timeType
;
}
public
int
getTimeDay
()
{
return
timeDay
;
}
public
void
setTimeDay
(
int
timeDay
)
{
this
.
timeDay
=
timeDay
;
}
public
String
getTimeTypeMsg
()
{
return
timeTypeMsg
;
}
public
void
setTimeTypeMsg
(
String
timeTypeMsg
)
{
this
.
timeTypeMsg
=
timeTypeMsg
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherRuleQuery.java
View file @
883cddac
...
...
@@ -99,6 +99,12 @@ public class VoucherRuleQuery extends AbstractPagedQuery<VoucherRuleQuery> {
private
Date
endUseDateEnd
;
/**
* 发放时间类型
* 1 时间段 2领取日起
*/
private
int
timeType
;
public
Integer
getId
()
{
return
id
;
}
...
...
@@ -270,4 +276,12 @@ public class VoucherRuleQuery extends AbstractPagedQuery<VoucherRuleQuery> {
public
void
setEndUseDateEnd
(
Date
endUseDateEnd
)
{
this
.
endUseDateEnd
=
endUseDateEnd
;
}
public
int
getTimeType
()
{
return
timeType
;
}
public
void
setTimeType
(
int
timeType
)
{
this
.
timeType
=
timeType
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherRuleVO.java
View file @
883cddac
...
...
@@ -63,6 +63,17 @@ public class VoucherRuleVO implements Serializable {
private
Date
expireDate
;
private
int
validFlag
;
/**
* 发放时间类型
* 1 时间段 2领取日起
*/
private
int
timeType
;
/**
* 领取日时间
*/
private
int
timeDay
;
/**
* @return the id
*/
...
...
@@ -226,5 +237,21 @@ public class VoucherRuleVO implements Serializable {
public
void
setValidFlag
(
int
validFlag
)
{
this
.
validFlag
=
validFlag
;
}
public
int
getTimeType
()
{
return
timeType
;
}
public
void
setTimeType
(
int
timeType
)
{
this
.
timeType
=
timeType
;
}
public
int
getTimeDay
()
{
return
timeDay
;
}
public
void
setTimeDay
(
int
timeDay
)
{
this
.
timeDay
=
timeDay
;
}
}
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