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
d94d6248
authored
Oct 25, 2017
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add the delay order
parent
00ed6086
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
1 deletions
src/main/java/com/ctrip/fun/admin/controller/order/OpCourseOrderController.java
src/main/java/com/ctrip/fun/admin/form/order/CourseOrderQueryForm.java
src/main/java/com/ctrip/fun/admin/service/order/CourseExcelExportService.java
src/main/webapp/WEB-INF/templates/order/common/OrderSearchForm.ftl
src/main/java/com/ctrip/fun/admin/controller/order/OpCourseOrderController.java
View file @
d94d6248
...
...
@@ -222,6 +222,10 @@ public class OpCourseOrderController extends AbstractOpOrderController<CourseOrd
excel
.
append
(
"orderNo="
+
form
.
getOrderNo
()
+
"&courseId="
+
courseId
+
"&districtName="
+
districtName
+
"&districtId="
+
districtId
+
"&userName="
+
userName
+
"&userId="
+
userId
+
"&contactTel="
+
contactTel
+
"&paymentType="
+
paymentType
+
"&total="
+
total
+
"&orderStartDate="
+
orderStartDate
+
"&orderEndDate="
+
orderEndDate
+
"&orderName="
+
orderName
+
"&playStartDate="
+
playStartDate
+
"&playEndDate="
+
playEndDate
+
"&received="
+
form
.
getReceived
()
+
"&orderSourceCategory="
+
form
.
getOrderSourceCategory
());
//add by caosy
if
(
form
.
getDelayOrder
()!=
null
&&
form
.
getDelayOrder
()){
excel
.
append
(
"&delayOrder="
+
form
.
getDelayOrder
());
}
model
.
put
(
"excelpath"
,
excel
.
toString
());
return
"order/list/"
+
orderMenuEnum
.
getResult
();
}
...
...
@@ -1179,6 +1183,13 @@ public class OpCourseOrderController extends AbstractOpOrderController<CourseOrd
placeOrder
.
setResourceList
(
orderResourceList
);
placeOrder
.
setChannel1
(
form
.
getChannel1
());
placeOrder
.
setChannel2
(
form
.
getChannel2
());
//add by caosy for delay order
if
(
DateUtil
.
getDistinceDay
(
form
.
getPlayDate
(),
new
Date
())
>
0
){
//补今天以前的单子, 不包括今天
placeOrder
.
setChannel1
(
"Off_D"
);
placeOrder
.
setChannel2
(
"01"
);
}
// offline支付不支持返现
placeOrder
.
setCashRebate
(
null
);
...
...
src/main/java/com/ctrip/fun/admin/form/order/CourseOrderQueryForm.java
View file @
d94d6248
...
...
@@ -27,6 +27,8 @@ public class CourseOrderQueryForm extends AbstractOrderQueryForm {
*/
private
int
received
;
private
Boolean
delayOrder
;
public
void
trim
()
{
this
.
orderNo
=
this
.
orderNo
.
trim
();
this
.
orderName
=
null
==
this
.
orderName
?
null
:
this
.
orderName
.
trim
();
...
...
@@ -100,4 +102,12 @@ public class CourseOrderQueryForm extends AbstractOrderQueryForm {
this
.
received
=
received
;
}
public
Boolean
getDelayOrder
()
{
return
delayOrder
;
}
public
void
setDelayOrder
(
Boolean
delayOrder
)
{
this
.
delayOrder
=
delayOrder
;
}
}
src/main/java/com/ctrip/fun/admin/service/order/CourseExcelExportService.java
View file @
d94d6248
...
...
@@ -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"
,
"实际结算金额"
,
"结算对象"
,
"结算日期"
,
"财务备注"
,
"余额"
,
"兑换卷"
,
"实收现金"
,
"退款金额"
,
"预存款支付金额"
,
"支付订单编号"
,
"手动扣款类型"
,
"订单来源"
,
"用户类型"
,
"补单"
};
return
title_all
;
case
"list_pay"
:
// 等待支付
String
title_pay
[]
=
{
"订单号"
,
"联系人"
,
"订单名称"
,
"城市"
,
"打球时间"
,
"支付方式"
,
"实付金额"
,
"下单时间"
,
"途径"
,
"状态"
,
"接管人"
,
"支付订单编号"
,
"手动扣款类型"
,
"订单来源"
,
"用户类型"
};
...
...
@@ -174,6 +174,7 @@ public class CourseExcelExportService extends AbstractExcelExportService<CourseO
cellList_all
.
get
(
36
).
setCellValue
(
bean
.
getOfflinePayTypeMsg
());
cellList_all
.
get
(
37
).
setCellValue
(
bean
.
getOrderSourceCategory
());
cellList_all
.
get
(
38
).
setCellValue
(
bean
.
getUserType
());
cellList_all
.
get
(
39
).
setCellValue
(
bean
.
isDelayOrder
()?
"是"
:
"否"
);
break
;
case
"list_pay"
:
// 等待支付
ArrayList
<
XSSFCell
>
cellList_pay
=
new
ArrayList
<
XSSFCell
>();
...
...
src/main/webapp/WEB-INF/templates/order/common/OrderSearchForm.ftl
View file @
d94d6248
...
...
@@ -11,6 +11,7 @@
<@com.NewSingleSelect "form.received" enums["com.ctrip.fun.common.vo.order.OrderReceiveStatusEnum"] "" "是否接管"/>
<@com.textInputTwoDate "form.playStartDate" "form.playEndDate" "style=\"margin-left: 5px;\"" "打球时间"/>
<@com.NewSingleSelect "form.orderSourceCategory" enums["com.ctrip.fun.common.vo.order.OrderSourceCategoryEnum"] "" "订单来源"/>
<@com.checkbox "form.delayOrder" "" "是否补单"/>
<div>
<button id="J_submit" type="button" class="btn btn-primary" onclick="javascript:searchOrderList();">查询</button>
</div>
...
...
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