导出优惠券

src/main/java/com/ctrip/fun/admin/controller/order/OpCourseOrderController.java

@@ -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

@@ -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

@@ -28,6 +28,8 @@ public class CourseOrderQueryForm extends AbstractOrderQueryForm {
     private int received;
     
     private Boolean delayOrder;
+    
+    private Boolean exportVoucher;
 
     public void trim() {
         this.orderNo = this.orderNo.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

@@ -25,6 +25,8 @@ public class EventActivityOrderQueryForm extends AbstractOrderQueryForm {
 
     private String orderName;
     private String city;
+    
+    private Boolean exportVoucher;
 
     public void trim() {
         this.orderNo = this.orderNo.trim();
@@ -89,5 +91,13 @@ public class EventActivityOrderQueryForm extends AbstractOrderQueryForm {
 	public void setCity(String city) {
 		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

@@ -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

@@ -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

@@ -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

@@ -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>