Skip to content

caosy / fun-admin

Go to a project
Commit 6db2f4c3 by caosy
Options

部分退款

parent 8df2ea0c
Inline Side-by-side
Showing with 80 additions and 15 deletions
src/main/java/com/ctrip/fun/admin/service/order/CourseExcelExportService.java
......@@ -40,7 +40,7 @@ public class CourseExcelExportService extends AbstractExcelExportService<CourseO
switch (listType) {
case "list_all":
String title_all[] = { "订单号", "联系人", "订单名称", "球场名称", "城市", "打球时间", "支付方式", "底价", "实付金额", "返佣", "返现", "保险", "下单时间", "支付时间", "途径", "状态", "接管人", "收款人", "推荐码", "下单人uid", "下单人注册时间",
"打球人数", "打球人1", "打球人2", "打球人3", "打球人4", "实际结算金额", "结算对象", "结算日期", "财务备注", "余额", "兑换卷", "实收现金", "在线支付退款金额", "余额退款金额" , "优惠券退款金额","预存款支付金额", "支付订单编号", "手动扣款类型", "订单来源", "用户类型","补单" };
"打球人数", "打球人1", "打球人2", "打球人3", "打球人4", "实际结算金额", "结算对象", "结算日期", "财务备注", "余额", "兑换卷", "实收现金", "在线支付退款金额", "余额退款金额" , "优惠券退款金额","预存款支付金额", "支付订单编号", "手动扣款类型", "订单来源", "用户类型","补单","优惠券张数","优惠券1","优惠券2","优惠券3","优惠券4" };
return title_all;
case "list_pay": // 等待支付
String title_pay[] = { "订单号", "联系人", "订单名称", "城市", "打球时间", "支付方式", "实付金额", "下单时间", "途径", "状态", "接管人", "支付订单编号", "手动扣款类型", "订单来源", "用户类型" };
......@@ -177,6 +177,19 @@ public class CourseExcelExportService extends AbstractExcelExportService<CourseO
cellList_all.get(39).setCellValue(bean.getOrderSourceCategory());
cellList_all.get(40).setCellValue(bean.getUserType());
cellList_all.get(41).setCellValue(bean.isDelayOrder()?"是":"否");
cellList_all.get(42).setCellValue(bean.getVoucherCount());
List<String> voucherIds = bean.getVoucherList();
if (voucherIds != null && voucherIds.size() > 0) {
int i = 43;
for (String cust : voucherIds) {
cellList_all.get(i).setCellValue(cust);
i++;
if (i == 43+4) {
// 默认显示前4个优惠券
break;
}
}
}
break;
case "list_pay": // 等待支付
ArrayList<XSSFCell> cellList_pay = new ArrayList<XSSFCell>();
......@@ -298,6 +311,19 @@ public class CourseExcelExportService extends AbstractExcelExportService<CourseO
cellList_complete.get(12).setCellValue(bean.getOfflinePayTypeMsg());
cellList_complete.get(13).setCellValue(bean.getOrderSourceCategory());
cellList_complete.get(14).setCellValue(bean.getUserType());
cellList_complete.get(16).setCellValue(bean.getVoucherCount());
List<String> vouchers = bean.getVoucherList();
if (vouchers != null && vouchers.size() > 0) {
int i = 17;
for (String cust : vouchers) {
cellList_complete.get(i).setCellValue(cust);
i++;
if (i == 43+4) {
// 默认显示前4个优惠券
break;
}
}
}
break;
case "list_refund":
ArrayList<XSSFCell> cellList_refund = new ArrayList<XSSFCell>();
......@@ -414,6 +440,19 @@ public class CourseExcelExportService extends AbstractExcelExportService<CourseO
cellList_all_complete.get(13).setCellValue(bean.getOfflinePayTypeMsg());
cellList_all_complete.get(14).setCellValue(bean.getOrderSourceCategory());
cellList_all_complete.get(15).setCellValue(bean.getUserType());
cellList_all_complete.get(16).setCellValue(bean.getVoucherCount());
List<String> voucherlist = bean.getVoucherList();
if (voucherlist != null && voucherlist.size() > 0) {
int i = 17;
for (String cust : voucherlist) {
cellList_all_complete.get(i).setCellValue(cust);
i++;
if (i == 43+4) {
// 默认显示前4个优惠券
break;
}
}
}
break;
case "list_notification":
ArrayList<XSSFCell> cellList_notification = new ArrayList<XSSFCell>();
......
src/main/java/com/ctrip/fun/admin/service/order/EventActivityExcelExportService.java
......@@ -41,7 +41,7 @@ public class EventActivityExcelExportService extends AbstractExcelExportService<
}else{
return new String[] { "订单号", "订单名称", "类型", "状态", "联系人姓名", "联系人电话", "报名人数", "会员数", "嘉宾数", "会员/嘉宾1", "嘉宾2", "嘉宾3", "嘉宾4", "性别1", "性别2", "性别3", "性别4", "差点1", "差点2", "差点3", "差点4",
"成员1手机号", "成员2手机号", "成员3手机号", "成员4手机号", "备注", "并组要求","会员价", "会员价立减", "嘉宾价", "嘉宾价立减", "实付","预付","余额","兑换券", "在线支付退款金额",
"余额退款金额" , "优惠券退款金额","保险", "底价", "接管人", "订单来源", "下单时间", "打球时间", "支付平台" };
"余额退款金额" , "优惠券退款金额","保险", "底价", "接管人", "订单来源", "下单时间", "打球时间", "支付平台", "优惠券数量" , "优惠券1", "优惠券2", "优惠券3", "优惠券4"};
}
}
......@@ -146,7 +146,20 @@ public class EventActivityExcelExportService extends AbstractExcelExportService<
cellList_all.get(41).setCellValue(bean.getOrderSourceCategory());
cellList_all.get(42).setCellValue(bean.getOrderDate() == null ? null : format.format(bean.getOrderDate()));
cellList_all.get(43).setCellValue(bean.getPlayDate() == null ? null : format.format(bean.getPlayDate()));
cellList_all.get(44).setCellValue(bean.getPlatform());
cellList_all.get(44).setCellValue(bean.getPlatform());
cellList_all.get(45).setCellValue(bean.getVoucherCount());
List<String> voucherIds = bean.getVoucherList();
if (voucherIds != null && voucherIds.size() > 0) {
int i = 46;
for (String cust : voucherIds) {
cellList_all.get(i).setCellValue(cust);
i++;
if (i == 46+4) {
// 默认显示前4个优惠券
break;
}
}
}
}
......
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/form.ftl
......@@ -214,6 +214,8 @@
<span style="padding-right: 20px;">广州</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="120" <#if dto.regionCode == "120">checked</#if>>
<span style="padding-right: 20px;">北京</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="130" <#if dto.regionCode == "130">checked</#if>>
<span style="padding-right: 20px;">俱乐部</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="1" <#if dto.regionCode == "1">checked</#if>>
<span style="padding-right: 20px;">全国</span>
<#else>
......@@ -223,6 +225,8 @@
<span style="padding-right: 20px;">广州</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="120" >
<span style="padding-right: 20px;">北京</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="130" >
<span style="padding-right: 20px;">俱乐部</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="1" >
<span style="padding-right: 20px;">全国</span>
</#if>
......@@ -230,18 +234,18 @@
</div>
<div class="long_content_div control-group" id="voucherRuleTypeValue1show">
<label class="control-label" for="type">卷类型</label>
<label class="control-label" for="type">劵类型</label>
<div class="controls">
<#if dto.voucherType??>
<input style="margin-bottom: 5px;" type="radio" name="voucherType" value="1" <#if dto.voucherType == 1>checked</#if>>
<span style="padding-right: 20px;">正常卷</span>
<span style="padding-right: 20px;">正常劵</span>
<input style="margin-bottom: 5px;" type="radio" name="voucherType" value="2" <#if dto.voucherType == 2>checked</#if>>
<span style="padding-right: 20px;">体验卷</span>
<span style="padding-right: 20px;">体验劵</span>
<#else>
<input style="margin-bottom: 5px;" type="radio" name="voucherType" value="1" checked>
<span style="padding-right: 20px;">正常卷</span>
<span style="padding-right: 20px;">正常劵</span>
<input style="margin-bottom: 5px;" type="radio" name="voucherType" value="2" >
<span style="padding-right: 20px;">体验金</span>
<span style="padding-right: 20px;">体验劵</span>
</#if>
</div>
</div>
......
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/list.ftl
......@@ -16,7 +16,7 @@
<@com.textInput "dto.id" "style=\"margin-left: 5px;\"" "活动ID"/>
<@com.textInput "dto.activityName" "style=\"margin-left: 5px;\"" "活动名称"/>
<@com.singleSelectQuery "dto.regionCode" enums["com.ctrip.fun.common.vo.basic.VoucherRegionCodeEnum"] "" "区域类型"/>
<@com.singleSelectQuery "dto.voucherType" enums["com.ctrip.fun.common.vo.basic.VoucherTypeCodeEnum"] "" "卷类型"/>
<@com.singleSelectQuery "dto.voucherType" enums["com.ctrip.fun.common.vo.basic.VoucherTypeCodeEnum"] "" "劵类型"/>
<@com.textInputTwoDate "dto.createdTimeStart" "dto.createdTimeEnd" "style=\"margin-left: 5px;\"" "创建时间"/>
<button type="submit" class="btn btn-primary">查询</button>
<button type="button" class="btn btn-success" onclick="javascript:location.href='/buyVoucherActivity/queryList';" style="margin-left:20px;">重置</button>
......@@ -70,6 +70,9 @@
<#case "120">
<td>北京</td>
<#break>
<#case "130">
<td>俱乐部</td>
<#break>
<#case "1">
<td>全国</td>
<#break>
......
src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/view.ftl
......@@ -188,17 +188,19 @@
<span style="padding-right: 20px;">广州</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="120">
<span style="padding-right: 20px;">北京</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="130">
<span style="padding-right: 20px;">俱乐部</span>
<input style="margin-bottom: 5px;" type="radio" name="regionCode" value="1" checked>
<span style="padding-right: 20px;">全国</span>
</div>
</div>
<div class="long_content_div control-group" id="voucherRuleTypeValue1show">
<label class="control-label" for="type">卷类型</label>
<label class="control-label" for="type">劵类型</label>
<div class="controls">
<input style="margin-bottom: 5px;" type="radio" name="voucherType" value="1" checked>
<span style="padding-right: 20px;">正常卷</span>
<span style="padding-right: 20px;">正常劵</span>
<input style="margin-bottom: 5px;" type="radio" name="voucherType" value="2">
<span style="padding-right: 20px;">体验卷</span>
<span style="padding-right: 20px;">体验劵</span>
</div>
</div>
<div class="long_content_div control-group" id="voucherRuleTypeValue1show">
......
src/main/webapp/WEB-INF/templates/system/UserInfoDetail.ftl
......@@ -605,14 +605,14 @@ $(function() {
<tr>
<th>编号</th>
<th>金额</th>
<th style="width:260px;">有效期</th>
<th>使用状态</th>
<th style="width:170px;">有效期</th>
<th style="width:50px;">使用状态</th>
<!--<th>使用时间</th>-->
<!--<th>订单号</th>-->
<th>到账时间</th>
<th>备注</th>
<th>描述</th>
<th style="width:95px;">操作</th>
<th style="width:85px;">操作</th>
<th><input class='delete-all' type='checkbox' name = 'checkAll'/>批量</th>
</tr>
<#list vourchers as vourcher>
......@@ -624,12 +624,16 @@ $(function() {
<#if vourcher.used == 1>
<font color="red">已使用</font>
<#else>
<#if vourcher.used == 2>
<font color="blue">已锁定</font>
<#else>
<#if vourcher.endUseDate?datetime gt.now?datetime >
<font color="green">未使用</font>
<#else>
<font color="grey">已过期</font>
</#if>
</#if>
</#if>
</td>
<!--<td>${(vourcher.useDate?string("yyyy-MM-dd HH:mm:ss"))!}</td>-->
......
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