Skip to content

caosy / fun-admin

Go to a project
Commit 636ecebe by Huang Linyu
Options

赛事活动订单页面显示打球时间teeTime

parent b29d400d
Inline Side-by-side
Showing with 18 additions and 16 deletions
src/main/java/com/ctrip/fun/admin/controller/basic/VoucherRuleController.java
......@@ -239,14 +239,14 @@ public class VoucherRuleController {
private void doValidateData(VoucherRuleDto dto, BindingResult bindingResult) {
VoucherTypeEnum voucherTypeEnum = VoucherTypeEnum.valueOf(dto.getVoucherType());
//验证面值
if(dto.getMultiple()==0){
if (dto.getAmount() != null && dto.getAmountCheck() != null) {
if (dto.getAmount().compareTo(dto.getAmountCheck()) != 0) {
FieldError fieldError1 = new FieldError("dto", "amount", dto.getAmount(), false,
null, null, "面值于确认面值不符");
null, null, "面值与确认面值不符");
FieldError fieldError2 = new FieldError("dto", "amountCheck", dto.getAmountCheck(),
false, null, null, "面值于确认面值不符");
false, null, null, "面值与确认面值不符");
bindingResult.addError(fieldError1);
bindingResult.addError(fieldError2);
}
......@@ -262,17 +262,17 @@ public class VoucherRuleController {
bindingResult.addError(fieldError1);
}
}
}
//验证张数
if (dto.getQuantity() != dto.getQuantityCheck()) {
FieldError fieldError1 = new FieldError("dto", "quantity", dto.getQuantity(), false,
null, null, "单用户发放张数于确认数量不符");
null, null, "单用户发放张数与确认数量不符");
FieldError fieldError2 = new FieldError("dto", "quantityCheck", dto.getQuantityCheck(),
false, null, null, "单用户发放张数于确认数量不符");
false, null, null, "单用户发放张数与确认数量不符");
bindingResult.addError(fieldError1);
bindingResult.addError(fieldError2);
}
//验证有效期
if (dto.getStartUseDate() != null && dto.getEndUseDate() != null) {
// 有效期结束时间定为当天结束时间
dto.setEndUseDate(DateUtil.getEndTime4Day(dto.getEndUseDate()));
......@@ -297,6 +297,7 @@ public class VoucherRuleController {
bindingResult.addError(fieldError1);
bindingResult.addError(fieldError2);
}
//立刻发送--手动输入用户UID, 拼接UID转换成List<String>类型
if (dto.getVoucherRuleType() == VoucherRuleTypeEnum.EXECUTE_RULE.getValue()
&& dto.getSendToUserType() == 2) {
String userId = dto.getSendToUserValue2();
......@@ -325,6 +326,7 @@ public class VoucherRuleController {
dto.setSendToUserValue2(StringUtils.collectionToDelimitedString(userList, ","));
}
}
//建立发送规则 判断为空
if (dto.getVoucherRuleType() == VoucherRuleTypeEnum.CREATE_RULE.getValue()) {
if (dto.getExpireDate() == null) {
FieldError fieldError = new FieldError("dto", "expireDate", dto.getExpireDate(),
......
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListCanceled.ftl
......@@ -22,7 +22,7 @@
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}&current=list_canceled">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.orderName!}</td>
<td>${item.playDate?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${item.playDate?string("yyyy-MM-dd ")}&nbsp; ${item.teeTime!''}</td>
<td>${item.userName!}</td>
<td>${item.mobilePhone!}</td>
<td>${item.quantity!}</td>
......
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListInvoice.ftl
......@@ -23,7 +23,7 @@
<td>${item.userName}</td>
<td>${item.orderName}</td>
<td>${item.cityName!}</td>
<td>${item.playDate?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${item.playDate?string("yyyy-MM-dd ")}&nbsp; ${item.teeTime!''}</td>
<td>${item.payMode!}</td>
<td>${item.actualAmount!}</td>
<td>${item.orderDate?string("yyyy-MM-dd HH:mm:ss")}</td>
......
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListNopay.ftl
......@@ -22,7 +22,7 @@
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}&current=list_nopay">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.orderName!}</td>
<td>${item.playDate?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${item.playDate?string("yyyy-MM-dd ")}&nbsp; ${item.teeTime!''}</td>
<td>${item.userName!}</td>
<td>${item.mobilePhone!}</td>
<td>${item.quantity!}</td>
......
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListPayfail.ftl
......@@ -22,7 +22,7 @@
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}&current=list_payfail">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.orderName!}</td>
<td>${item.playDate?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${item.playDate?string("yyyy-MM-dd ")}&nbsp; ${item.teeTime!''}</td>
<td>${item.userName!}</td>
<td>${item.mobilePhone!}</td>
<td>${item.quantity!}</td>
......
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListPaying.ftl
......@@ -23,7 +23,7 @@
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}&current=list_payfail">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.orderName!}</td>
<td>${item.playDate?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${item.playDate?string("yyyy-MM-dd ")}&nbsp; ${item.teeTime!''}</td>
<td>${item.userName!}</td>
<td>${item.mobilePhone!}</td>
<td>${item.quantity!}</td>
......
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListPaysuccess.ftl
......@@ -23,7 +23,7 @@
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}&current=list_paysuccess">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.orderName!}</td>
<td>${item.playDate?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${item.playDate?string("yyyy-MM-dd ")}&nbsp; ${item.teeTime!''}</td>
<td>${item.userName!}</td>
<td>${item.mobilePhone!}</td>
<td>${item.quantity!}</td>
......
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListProcessing.ftl
......@@ -75,7 +75,7 @@
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}&current=list_processing">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.orderName!}</td>
<td>${item.playDate?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${item.playDate?string("yyyy-MM-dd ")}&nbsp; ${item.teeTime!''}</td>
<td>${item.userName!}</td>
<td>${item.mobilePhone!}</td>
<td>${item.quantity!}</td>
......
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListRefundsuccess.ftl
......@@ -22,7 +22,7 @@
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}&current=list_refundsuccess">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.orderName!}</td>
<td>${item.playDate?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${item.playDate?string("yyyy-MM-dd ")}&nbsp; ${item.teeTime!''}</td>
<td>${item.userName!}</td>
<td>${item.mobilePhone!}</td>
<td>${item.quantity!}</td>
......
src/main/webapp/WEB-INF/templates/user/ranking.ftl
......@@ -195,7 +195,7 @@
}
var totalLi = "";
totalLi+='<li style="background:#3de899"><div class="rank"></div>\n';
totalLi+='<div class="name"></div>\n';
totalLi+='<div class="name">合计</div>\n';
totalLi+='<div class="num">' + total_myNum1 + '</div>\n';
totalLi+='<div class="num">' + total_myNum2 + '</div>\n';
totalLi+='<div class="num">' + total_myNum3 + '</div>\n';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment