Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
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
cce29e20
authored
Jun 12, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
旭宝代金券发放添加onlyMe字段
parent
5072712a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
3 deletions
src/main/java/com/ctrip/fun/admin/controller/basic/VoucherRuleController.java
src/main/java/com/ctrip/fun/admin/vo/basic/VoucherRuleDto.java
src/main/webapp/WEB-INF/templates/basic/voucherRule/form.ftl
src/main/java/com/ctrip/fun/admin/controller/basic/VoucherRuleController.java
View file @
cce29e20
...
...
@@ -432,6 +432,7 @@ public class VoucherRuleController {
.
getProductStartDate
());
ruleConditionBean
.
setProductEndDate
(
DateUtil
.
getEndTime4Day
(
dto
.
getCourseRuleConditionBean
().
getProductEndDate
()));
ruleConditionBean
.
setOnlyMe
(
dto
.
getOnlyMe
());
}
}
else
{
...
...
@@ -447,6 +448,7 @@ public class VoucherRuleController {
.
getProductStartDate
());
ruleConditionBean
.
setProductEndDate
(
DateUtil
.
getEndTime4Day
(
dto
.
getCourseRuleConditionBean
().
getProductEndDate
()));
ruleConditionBean
.
setOnlyMe
(
dto
.
getOnlyMe
());
}
}
else
{
// int type=dto.getMultipleCourseConditionBean().getType();
...
...
@@ -455,8 +457,10 @@ public class VoucherRuleController {
}
if
(
dto
.
getMultiple
()==
1
){
MultipleCourseConditionBean
multiConditionBean
=
dto
.
getMultipleCourseConditionBean
();
multiConditionBean
.
setOnlyMe
(
dto
.
getOnlyMe
());
voucherRuleBean
.
setConditionBean
(
MultipleCourseConditionBean
.
class
.
getName
());
voucherRuleBean
.
setConditionJson
(
JsonUtil
.
writeValueAsString
(
multiConditionBean
));
}
else
{
voucherRuleBean
.
setConditionBean
(
voucherTypeEnum
.
getRuleConditionBean
().
getClass
()
...
...
src/main/java/com/ctrip/fun/admin/vo/basic/VoucherRuleDto.java
View file @
cce29e20
...
...
@@ -177,9 +177,14 @@ public class VoucherRuleDto {
* 状态msg
*/
private
String
statusMsg
;
/**
* 是否仅限本人使用
*/
private
int
onlyMe
;
//仅限本人使用:1是;0否
public
VoucherRuleDto
(
MultipleCourseConditionBean
multipleCourseConditionBean
)
{
super
();
...
...
@@ -365,8 +370,16 @@ public class VoucherRuleDto {
public
void
setValidFlag
(
int
validFlag
)
{
this
.
validFlag
=
validFlag
;
}
public
int
getOnlyMe
()
{
return
onlyMe
;
}
public
void
setOnlyMe
(
int
onlyMe
)
{
this
.
onlyMe
=
onlyMe
;
}
public
String
getOperater
()
{
public
String
getOperater
()
{
return
operater
;
}
...
...
src/main/webapp/WEB-INF/templates/basic/voucherRule/form.ftl
View file @
cce29e20
...
...
@@ -471,7 +471,15 @@ $(function(){
<@form.textInput path="dto.quantity" attributes="class=\"input-medium\"" label="单用户发放张数" required = true type="number" />
<@form.textInput path="dto.quantityCheck" attributes="class=\"input-medium\"" label="发放张数确认" required = true type="number" />
<div class="long_content_div control-group" id="voucherRuleTypeValue1show">
<label class="control-label" for="type">用户本人使用</label>
<div class="controls">
<input style="margin-bottom: 5px;" type="radio" name="onlyMe" value="0" checked>
<span style="padding-right: 20px;">否</span>
<input style="margin-bottom: 5px;" type="radio" name="onlyMe" value="1">
<span style="padding-right: 20px;">是</span>
</div>
</div>
<#if dto.voucherRuleType == 1>
<div class="long_content_div control-group" id="voucherRuleTypeValue1show">
<label class="control-label" for="type">发放用户选择</label>
...
...
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