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
579b0182
authored
Jun 13, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代金券后台查看详情时显示代金券是否只限本人使用
parent
cce29e20
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
0 deletions
src/main/java/com/ctrip/fun/admin/controller/basic/VoucherRuleController.java
src/main/webapp/WEB-INF/templates/basic/voucherRule/view.ftl
src/main/java/com/ctrip/fun/admin/controller/basic/VoucherRuleController.java
View file @
579b0182
...
@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
...
@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import
org.springframework.web.servlet.mvc.support.RedirectAttributes
;
import
org.springframework.web.servlet.mvc.support.RedirectAttributes
;
import
org.springframework.web.util.HtmlUtils
;
import
org.springframework.web.util.HtmlUtils
;
import
com.alibaba.fastjson.JSONObject
;
import
com.ctrip.fun.admin.form.PaginationForm
;
import
com.ctrip.fun.admin.form.PaginationForm
;
import
com.ctrip.fun.admin.service.basic.VoucherRuleService
;
import
com.ctrip.fun.admin.service.basic.VoucherRuleService
;
import
com.ctrip.fun.admin.service.system.UserService
;
import
com.ctrip.fun.admin.service.system.UserService
;
...
@@ -131,6 +132,12 @@ public class VoucherRuleController {
...
@@ -131,6 +132,12 @@ public class VoucherRuleController {
VoucherRuleBean
bean
=
voucherRuleService
.
getById
(
id
);
VoucherRuleBean
bean
=
voucherRuleService
.
getById
(
id
);
VoucherRuleDto
dto
=
new
VoucherRuleDto
();
VoucherRuleDto
dto
=
new
VoucherRuleDto
();
BeanConverter
.
copyProperties
(
dto
,
bean
);
BeanConverter
.
copyProperties
(
dto
,
bean
);
JSONObject
jsobj
=
JSONObject
.
parseObject
(
dto
.
getConditionJson
());
if
(
jsobj
.
get
(
"onlyMe"
)!=
null
&&(
Integer
)
jsobj
.
get
(
"onlyMe"
)==
1
){
dto
.
setOnlyMe
(
1
);
}
else
{
dto
.
setOnlyMe
(
0
);
}
if
(
dto
.
getVoucherType
()
!=
0
)
{
if
(
dto
.
getVoucherType
()
!=
0
)
{
dto
.
setVoucherTypeMsg
(
VoucherTypeEnum
.
valueOf
(
dto
.
getVoucherType
()).
getMsg
());
dto
.
setVoucherTypeMsg
(
VoucherTypeEnum
.
valueOf
(
dto
.
getVoucherType
()).
getMsg
());
}
}
...
...
src/main/webapp/WEB-INF/templates/basic/voucherRule/view.ftl
View file @
579b0182
...
@@ -469,6 +469,16 @@ function getResourceList(page){
...
@@ -469,6 +469,16 @@ function getResourceList(page){
<td style="text-align:left">${dto.quantity!}</td>
<td style="text-align:left">${dto.quantity!}</td>
</tr>
</tr>
<tr>
<tr>
<td style="text-align:left">本人使用</td>
<td style="text-align:left">
<#if dto.onlyMe == 1>
是
<#elseif dto.onlyMe == 0>
否
</#if>
</td>
</tr>
<tr>
<#if dto.sendToUserType == 1>
<#if dto.sendToUserType == 1>
<td style="text-align:left">发放用户类型</td>
<td style="text-align:left">发放用户类型</td>
<td style="text-align:left">${dto.sendToUserValueMsg!}</td>
<td style="text-align:left">${dto.sendToUserValueMsg!}</td>
...
...
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