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
f66cd9f1
authored
Nov 23, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优惠券创建增加分享限制
parent
35b34e73
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
4 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/BuyVoucherActivityBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherBean.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/BuyVoucherActivityBean.java
View file @
f66cd9f1
...
@@ -115,8 +115,8 @@ public class BuyVoucherActivityBean implements Serializable {
...
@@ -115,8 +115,8 @@ public class BuyVoucherActivityBean implements Serializable {
this
.
buyLimitTimes
=
buyLimitTimes
;
this
.
buyLimitTimes
=
buyLimitTimes
;
}
}
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
,
timezone
=
"GMT+8"
)
public
Date
getActivityStart
()
{
public
Date
getActivityStart
()
{
return
activityStart
;
return
activityStart
;
}
}
...
@@ -125,8 +125,8 @@ public class BuyVoucherActivityBean implements Serializable {
...
@@ -125,8 +125,8 @@ public class BuyVoucherActivityBean implements Serializable {
this
.
activityStart
=
activityStart
;
this
.
activityStart
=
activityStart
;
}
}
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
,
timezone
=
"GMT+8"
)
public
Date
getActivityEnd
()
{
public
Date
getActivityEnd
()
{
return
activityEnd
;
return
activityEnd
;
}
}
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherBean.java
View file @
f66cd9f1
...
@@ -36,6 +36,16 @@ public class VoucherBean {
...
@@ -36,6 +36,16 @@ public class VoucherBean {
* 使用规则
* 使用规则
*/
*/
private
String
remark
;
private
String
remark
;
//是否可分享
private
int
shared
;
//是否分享了
private
int
isShare
;
//领券人限制:不限制,vpi,社员,社员并且vip
private
int
userLimit
;
//0,2,4,6
public
Integer
getId
()
{
public
Integer
getId
()
{
return
id
;
return
id
;
}
}
...
@@ -171,4 +181,30 @@ public class VoucherBean {
...
@@ -171,4 +181,30 @@ public class VoucherBean {
public
void
setRemark
(
String
remark
)
{
public
void
setRemark
(
String
remark
)
{
this
.
remark
=
remark
;
this
.
remark
=
remark
;
}
}
public
int
getShared
()
{
return
shared
;
}
public
void
setShared
(
int
shared
)
{
this
.
shared
=
shared
;
}
public
int
getIsShare
()
{
return
isShare
;
}
public
void
setIsShare
(
int
isShare
)
{
this
.
isShare
=
isShare
;
}
public
int
getUserLimit
()
{
return
userLimit
;
}
public
void
setUserLimit
(
int
userLimit
)
{
this
.
userLimit
=
userLimit
;
}
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherRuleBean.java
View file @
f66cd9f1
...
@@ -161,6 +161,11 @@ public class VoucherRuleBean implements java.io.Serializable {
...
@@ -161,6 +161,11 @@ public class VoucherRuleBean implements java.io.Serializable {
* 是否可分享
* 是否可分享
*/
*/
private
int
shared
;
//是否可分享:1是;0否
private
int
shared
;
//是否可分享:1是;0否
/**
* 分享领取限制
*/
private
int
userLimit
;
//分享领取限制0:不限 2社员
@SuppressWarnings
(
"rawtypes"
)
@SuppressWarnings
(
"rawtypes"
)
public
AbstractRuleConditionBean
getRuleCondition
()
{
public
AbstractRuleConditionBean
getRuleCondition
()
{
...
@@ -415,4 +420,12 @@ public class VoucherRuleBean implements java.io.Serializable {
...
@@ -415,4 +420,12 @@ public class VoucherRuleBean implements java.io.Serializable {
this
.
shared
=
shared
;
this
.
shared
=
shared
;
}
}
public
int
getUserLimit
()
{
return
userLimit
;
}
public
void
setUserLimit
(
int
userLimit
)
{
this
.
userLimit
=
userLimit
;
}
}
}
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