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
4f28f15a
authored
May 07, 2021
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导出优惠券
parent
6db2f4c3
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
39 additions
and
1 deletions
src/main/java/com/ctrip/fun/admin/controller/order/OpCourseOrderController.java
src/main/java/com/ctrip/fun/admin/controller/order/OpEventActivityOrderController.java
src/main/java/com/ctrip/fun/admin/form/order/CourseOrderQueryForm.java
src/main/java/com/ctrip/fun/admin/form/order/EventActivityOrderQueryForm.java
src/main/java/com/ctrip/fun/admin/form/order/TourOrderQueryForm.java
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/eventActivityOrderSearchForm.ftl
src/main/webapp/WEB-INF/templates/order/common/OrderSearchForm.ftl
src/main/webapp/WEB-INF/templates/tourOrder/common/TourOrderSearchForm.ftl
src/main/java/com/ctrip/fun/admin/controller/order/OpCourseOrderController.java
View file @
4f28f15a
...
...
@@ -237,6 +237,9 @@ public class OpCourseOrderController extends AbstractOpOrderController<CourseOrd
if
(
form
.
getDelayOrder
()!=
null
&&
form
.
getDelayOrder
()){
excel
.
append
(
"&delayOrder="
+
form
.
getDelayOrder
());
}
if
(
form
.
getExportVoucher
()!=
null
&&
form
.
getExportVoucher
()){
excel
.
append
(
"&exportVoucher="
+
form
.
getExportVoucher
());
}
model
.
put
(
"excelpath"
,
excel
.
toString
());
return
"order/list/"
+
orderMenuEnum
.
getResult
();
}
...
...
src/main/java/com/ctrip/fun/admin/controller/order/OpEventActivityOrderController.java
View file @
4f28f15a
...
...
@@ -181,7 +181,9 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
.
append
(
"&total="
).
append
(
total
)
.
append
(
"&orderSourceCategory="
).
append
(
form
.
getOrderSourceCategory
())
.
append
(
"&city="
).
append
(
city
);
if
(
form
.
getExportVoucher
()!=
null
&&
form
.
getExportVoucher
()){
excel
.
append
(
"&exportVoucher="
+
form
.
getExportVoucher
());
}
model
.
put
(
"excelpath"
,
excel
.
toString
());
return
"eventActivityOrder/list/"
+
eventActivityorderMenuEnum
.
getResult
();
...
...
src/main/java/com/ctrip/fun/admin/form/order/CourseOrderQueryForm.java
View file @
4f28f15a
...
...
@@ -29,6 +29,8 @@ public class CourseOrderQueryForm extends AbstractOrderQueryForm {
private
Boolean
delayOrder
;
private
Boolean
exportVoucher
;
public
void
trim
()
{
this
.
orderNo
=
this
.
orderNo
.
trim
();
this
.
orderName
=
null
==
this
.
orderName
?
null
:
this
.
orderName
.
trim
();
...
...
@@ -102,6 +104,14 @@ public class CourseOrderQueryForm extends AbstractOrderQueryForm {
this
.
received
=
received
;
}
public
Boolean
getExportVoucher
()
{
return
exportVoucher
;
}
public
void
setExportVoucher
(
Boolean
exportVoucher
)
{
this
.
exportVoucher
=
exportVoucher
;
}
public
Boolean
getDelayOrder
()
{
return
delayOrder
;
}
...
...
src/main/java/com/ctrip/fun/admin/form/order/EventActivityOrderQueryForm.java
View file @
4f28f15a
...
...
@@ -26,6 +26,8 @@ public class EventActivityOrderQueryForm extends AbstractOrderQueryForm {
private
String
orderName
;
private
String
city
;
private
Boolean
exportVoucher
;
public
void
trim
()
{
this
.
orderNo
=
this
.
orderNo
.
trim
();
this
.
userName
=
null
==
this
.
userName
?
null
:
this
.
userName
.
trim
();
...
...
@@ -90,4 +92,12 @@ public class EventActivityOrderQueryForm extends AbstractOrderQueryForm {
this
.
city
=
city
;
}
public
Boolean
getExportVoucher
()
{
return
exportVoucher
;
}
public
void
setExportVoucher
(
Boolean
exportVoucher
)
{
this
.
exportVoucher
=
exportVoucher
;
}
}
src/main/java/com/ctrip/fun/admin/form/order/TourOrderQueryForm.java
View file @
4f28f15a
...
...
@@ -31,6 +31,8 @@ public class TourOrderQueryForm extends AbstractOrderQueryForm {
private
String
orderName
;
private
Boolean
exportVoucher
;
public
void
trim
()
{
this
.
orderNo
=
this
.
orderNo
.
trim
();
this
.
userName
=
null
==
this
.
userName
?
null
:
this
.
userName
.
trim
();
...
...
@@ -95,4 +97,12 @@ public class TourOrderQueryForm extends AbstractOrderQueryForm {
this
.
orderName
=
orderName
;
}
public
Boolean
getExportVoucher
()
{
return
exportVoucher
;
}
public
void
setExportVoucher
(
Boolean
exportVoucher
)
{
this
.
exportVoucher
=
exportVoucher
;
}
}
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/eventActivityOrderSearchForm.ftl
View file @
4f28f15a
...
...
@@ -10,6 +10,7 @@
<@com.textInputTwoDate "form.playStartDate" "form.playEndDate" "style=\"margin-left: 5px;\"" "打球时间"/>
<@com.NewSingleSelect "form.orderSourceCategory" enums["com.ctrip.fun.common.vo.order.OrderSourceCategoryEnum"] "" "订单来源"/>
<@com.textInput "form.city" "style=\"margin-left: 5px;\"" "城市" "text"/>
<@com.checkbox "form.exportVoucher" "" "是否导出优惠券"/>
<div>
<button id="J_submit" type="button" class="btn btn-primary" onclick="javascript:searchRechargeOrderList();">搜索</button>
</div>
...
...
src/main/webapp/WEB-INF/templates/order/common/OrderSearchForm.ftl
View file @
4f28f15a
...
...
@@ -12,6 +12,7 @@
<@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" "" "是否补单"/>
<@com.checkbox "form.exportVoucher" "" "是否导出优惠券"/>
<div>
<button id="J_submit" type="button" class="btn btn-primary" onclick="javascript:searchOrderList();">查询</button>
</div>
...
...
src/main/webapp/WEB-INF/templates/tourOrder/common/TourOrderSearchForm.ftl
View file @
4f28f15a
...
...
@@ -8,6 +8,7 @@
<@com.NewSingleSelect "form.received" enums["com.ctrip.fun.common.vo.order.OrderReceiveStatusEnum"] "" "是否接管"/>
<@com.textInputTwoDate "form.tourOrderStartDate" "form.tourOrderEndDate" "style=\"margin-left: 5px;\"" "下单时间"/>
<@com.textInputTwoDate "form.departureStartDate" "form.departureEndDate" "style=\"margin-left: 5px;\"" "出行日期"/>
<@com.checkbox "form.exportVoucher" "" "是否导出优惠券"/>
<div>
<button id="J_submit" type="button" class="btn btn-primary" onclick="javascript:searchTourOrderList();">搜索</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