add the voucher for tour

src/main/java/com/ctrip/fun/admin/controller/basic/VoucherRuleController.java

@@ -487,6 +487,12 @@ public class VoucherRuleController {
         nameIdBean2.setName(VoucherTypeEnum.EVENT_ACTIVITY.getMsg());
         nameIdBean2.setId(VoucherTypeEnum.EVENT_ACTIVITY.getValue());
         result.add(nameIdBean2);
+        
+        NameIdBean<Integer> nameIdBean3 = new NameIdBean<Integer>();
+        nameIdBean3.setName(VoucherTypeEnum.TOUR.getMsg());
+        nameIdBean3.setId(VoucherTypeEnum.TOUR.getValue());
+        result.add(nameIdBean3);
+        
         return result;
     }
 

src/main/webapp/WEB-INF/templates/basic/voucherRule/form.ftl

@@ -186,7 +186,7 @@ $(function(){
 		}
 	});
 	
-	<#if dto.voucherRuleType == 1 || dto.voucherType == 4 >
+	<#if dto.voucherRuleType == 1 || dto.voucherType == 4 || dto.voucherType == 2 >
 	//用户类型选择
 	$("input[type=radio][name='sendToUserType']").click(function(){
 		if($(this).val()==1){
@@ -205,7 +205,7 @@ $(function(){
 	}
 	</#if>
 	
-	<#if dto.voucherType == 1 || dto.voucherType == 4 >
+	<#if dto.voucherType == 1 || dto.voucherType == 4 || dto.voucherType == 2>
 	//=============================球场预定/赛事=================================START
 	
 	//产品类型选择
@@ -382,11 +382,10 @@ $(function(){
             <div class="feature_content">
             	<@form.singleSelect path="dto.voucherRuleType" options=enums["com.ctrip.fun.common.vo.basic.VoucherRuleTypeEnum"] attributes="required" label="发放类型" required=true/>
             	<@form.singleSelect path="dto.voucherType" options=VoucherTypeList attributes="required" label="现金券类型" required=true/>
-            	
             	<@form.singleSelect path="dto.multiple" options=enums["com.ctrip.fun.common.vo.basic.VoucherRuleMultiEnum"] attributes="required" label="多球场现金券" required=true/>
             	
             	
-            	<#if dto.voucherType == 1 || dto.voucherType == 4 >
+            	<#if dto.voucherType == 1 || dto.voucherType == 4 || dto.voucherType==2>
            	
             	<div id="courseRuleConditionBeanId">
 	            	<div class="long_content_div control-group">