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
f5b4be8c
authored
Jun 22, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
赛事订单增加等待发票寄送列表;赛事订单导出增加余额退款、优惠券退款、在线支付退款功能
parent
579b0182
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
67 additions
and
7 deletions
src/main/java/com/ctrip/fun/admin/service/order/EventActivityExcelExportService.java
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListInvoice.ftl
src/main/java/com/ctrip/fun/admin/service/order/EventActivityExcelExportService.java
View file @
f5b4be8c
package
com
.
ctrip
.
fun
.
admin
.
service
.
order
;
import
java.math.BigDecimal
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -32,7 +33,7 @@ public class EventActivityExcelExportService extends AbstractExcelExportService<
@Override
public
String
[]
getRowsName
(
String
listType
)
{
return
new
String
[]
{
"订单号"
,
"订单名称"
,
"类型"
,
"状态"
,
"联系人姓名"
,
"联系人电话"
,
"报名人数"
,
"会员数"
,
"嘉宾数"
,
"会员/嘉宾1"
,
"嘉宾2"
,
"嘉宾3"
,
"嘉宾4"
,
"性别1"
,
"性别2"
,
"性别3"
,
"性别4"
,
"差点1"
,
"差点2"
,
"差点3"
,
"差点4"
,
"成员1手机号"
,
"成员2手机号"
,
"成员3手机号"
,
"成员4手机号"
,
"备注"
,
"并组要求"
,
"会员价"
,
"会员价立减"
,
"嘉宾价"
,
"嘉宾价立减"
,
"实付"
,
"预付"
,
"余额"
,
"兑换券"
,
"保险"
,
"底价"
,
"接管人"
,
"订单来源"
,
"下单时间"
,
"打球时间"
};
"成员1手机号"
,
"成员2手机号"
,
"成员3手机号"
,
"成员4手机号"
,
"备注"
,
"并组要求"
,
"会员价"
,
"会员价立减"
,
"嘉宾价"
,
"嘉宾价立减"
,
"实付"
,
"预付"
,
"余额"
,
"兑换券"
,
"
在线支付退款金额"
,
"余额退款金额"
,
"优惠券退款金额"
,
"
保险"
,
"底价"
,
"接管人"
,
"订单来源"
,
"下单时间"
,
"打球时间"
};
}
@Override
...
...
@@ -80,14 +81,18 @@ public class EventActivityExcelExportService extends AbstractExcelExportService<
cellList_all
.
get
(
32
).
setCellValue
(
bean
.
getPrePayAmount
().
doubleValue
());
cellList_all
.
get
(
33
).
setCellValue
(
bean
.
getPrePayCardAmount
().
doubleValue
());
cellList_all
.
get
(
34
).
setCellValue
(
bean
.
getVoucherAmount
().
doubleValue
());
cellList_all
.
get
(
35
).
setCellValue
(
bean
.
getRefundAmount
()
==
null
?
BigDecimal
.
ZERO
.
toString
()
:
bean
.
getRefundAmount
().
toString
());
cellList_all
.
get
(
36
).
setCellValue
(
bean
.
getPrePayCardRefundAmount
()
==
null
?
BigDecimal
.
ZERO
.
toString
()
:
bean
.
getPrePayCardRefundAmount
().
toString
());
cellList_all
.
get
(
37
).
setCellValue
(
bean
.
getVoucherRefundAmount
()
==
null
?
BigDecimal
.
ZERO
.
toString
()
:
bean
.
getVoucherRefundAmount
().
toString
());
//add by caosy for InsuranceAmount
cellList_all
.
get
(
3
5
).
setCellValue
(
bean
.
getInsuranceAmount
().
doubleValue
());
cellList_all
.
get
(
3
6
).
setCellValue
(
bean
.
getFloorPrice
().
doubleValue
());
cellList_all
.
get
(
3
8
).
setCellValue
(
bean
.
getInsuranceAmount
().
doubleValue
());
cellList_all
.
get
(
3
9
).
setCellValue
(
bean
.
getFloorPrice
().
doubleValue
());
cellList_all
.
get
(
37
).
setCellValue
(
bean
.
getReceiver
());
cellList_all
.
get
(
38
).
setCellValue
(
bean
.
getOrderSourceCategory
());
cellList_all
.
get
(
39
).
setCellValue
(
bean
.
getOrderDate
()
==
null
?
null
:
format
.
format
(
bean
.
getOrderDate
()));
cellList_all
.
get
(
4
0
).
setCellValue
(
bean
.
getPlayDate
()
==
null
?
null
:
format
.
format
(
bean
.
getPlayDate
()));
cellList_all
.
get
(
40
).
setCellValue
(
bean
.
getReceiver
());
cellList_all
.
get
(
41
).
setCellValue
(
bean
.
getOrderSourceCategory
());
cellList_all
.
get
(
42
).
setCellValue
(
bean
.
getOrderDate
()
==
null
?
null
:
format
.
format
(
bean
.
getOrderDate
()));
cellList_all
.
get
(
4
3
).
setCellValue
(
bean
.
getPlayDate
()
==
null
?
null
:
format
.
format
(
bean
.
getPlayDate
()));
}
@Override
...
...
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListInvoice.ftl
0 → 100644
View file @
f5b4be8c
<#include "../common/pageJsContent.ftl"/>
<@com.layout title="全部订单" module="eventActivityOrder" current="list_all" pageJs=pageJsContent>
<#include "../common/eventActivityOrderSearchForm.ftl"/>
<table class="table table-bordered table-striped table-font">
<tr>
<th>订单号</th>
<th>用户ID</th>
<th>名称</th>
<th>打球时间</th>
<th>用户名</th>
<th>手机号</th>
<th>订单人数</th>
<th>支付时间</th>
<th>下单时间</th>
<th>状态</th>
<th>接管人</th>
<th>已存发票信息</th>
<th>订单来源</th>
</tr>
<#list list as item>
<tr>
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}¤t=list_all">${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 ")} ${item.teeTime!''}
</td>
<td>${item.userName!}</td>
<td>${item.mobilePhone!}</td>
<td>${item.quantity!}</td>
<td><#if item.payDate??>${item.payDate?string("yyyy-MM-dd HH:mm:ss")}<#else></#if></td>
<td><#if item.orderDate??>${item.orderDate?string("yyyy-MM-dd HH:mm:ss")}<#else></#if></td>
<td>${item.orderStatusString!}</td>
<td>${item.receiver!}</td>
<td>${item.isInvoiceDesc!}</td>
<td>${item.orderSourceCategory!}</td>
</tr>
</#list>
</table>
<div class="row-fluid">
<div class="pagination pagination-left">
<a href="${excelpath}">excel导出</a>
</div>
<div class="pagination pagination-right">
<ul class="pagination pagination-right">
<@paginator.first />
<@paginator.previous />
<@paginator.numbers separator=""/>
<@paginator.next />
<@paginator.last />
</ul>
<@paginator.statistics />
</div>
</div>
</@com.layout>
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