社员权益退款单

src/main/java/com/ctrip/fun/admin/form/order/VoucherOrderQueryForm.java

@@ -9,6 +9,7 @@ public class VoucherOrderQueryForm  extends AbstractOrderQueryForm{
 	private String orderName;			//订单名称
 	private String orderName;			//订单名称
 	private String recommendUserName;	//推荐人姓名
 	private String recommendUserName;	//推荐人姓名
 	private String recommendPhone;		//推荐人手机号码
 	private String recommendPhone;		//推荐人手机号码
+	private Integer processStatus;      //订单状态
 	
 	
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date orderStartDate;
 	private Date orderStartDate;
@@ -56,4 +57,13 @@ public class VoucherOrderQueryForm  extends AbstractOrderQueryForm{
 		this.recommendPhone = recommendPhone;
 		this.recommendPhone = recommendPhone;
 	}
 	}
 	
 	
+
+	public Integer getProcessStatus() {
+		return processStatus;
+	}
+
+	public void setProcessStatus(Integer processStatus) {
+		this.processStatus = processStatus;
+	}
+	
 }
 }

src/main/webapp/WEB-INF/templates/voucherOrder/common/voucherOrderSearchForm.ftl

@@ -6,6 +6,15 @@
 <@com.textInput "form.contactTel" "style=\"margin-left: 5px;\"" "联系人手机号" "text"/>
 <@com.textInput "form.contactTel" "style=\"margin-left: 5px;\"" "联系人手机号" "text"/>
 <@com.textInput "form.recommendUserName" "style=\"margin-left: 5px;\"" "推荐人" "text"/>
 <@com.textInput "form.recommendUserName" "style=\"margin-left: 5px;\"" "推荐人" "text"/>
 <@com.textInput "form.recommendPhone" "style=\"margin-left: 5px;\"" "推荐人手机号" "text"/>
 <@com.textInput "form.recommendPhone" "style=\"margin-left: 5px;\"" "推荐人手机号" "text"/>
+<div class="short_content_div"> 
+	<label class="control-label" for="processStatus" style="margin-left: 5px;">订单类型</label>
+	<select id="processStatus" name="processStatus">
+	    <option value="">全部</option>
+		<option value="20" <#if form.processStatus?? && form.processStatus == 20 > selected="selected" </#if> >支付成功</option>
+		<option value="100" <#if form.processStatus?? && form.processStatus == 100 > selected="selected" </#if> >退款成功</option>
+		
+	</select>
+</div>
 <@com.textInputTwoDate "form.orderStartDate" "form.orderEndDate" "style=\"margin-left: 5px;\"" "下单时间"/>
 <@com.textInputTwoDate "form.orderStartDate" "form.orderEndDate" "style=\"margin-left: 5px;\"" "下单时间"/>
 
 
 
 

src/main/webapp/WEB-INF/templates/voucherOrder/list/voucherOrderListAll.ftl

@@ -90,6 +90,7 @@ function updateMobilePhone(){
         <th>推荐人</th>
         <th>推荐人</th>
         <th>推荐人手机号</th>
         <th>推荐人手机号</th>
         <th>携程订单号</th>
         <th>携程订单号</th>
+        <th>订单状态</th>
         <th colspan=1>操作</th>
         <th colspan=1>操作</th>
     </tr>
     </tr>
     	
     	
@@ -110,6 +111,16 @@ function updateMobilePhone(){
             <#else>
             <#else>
             	<td></td>
             	<td></td>
             </#if>
             </#if>
+            <#switch item.processStatus>
+			  <#case 20>  
+			        <td>支付成功</td>
+			       	<#break>
+			  <#case 100>  
+			        <td>退款成功</td>
+			        <#break>
+			  <#default>  
+			       	 未知
+			</#switch>
             <td><a  href="javascript:void(0);"  target="_blank"  onclick="changeMobilePhoneToEdit('${item.orderId!}')">修改开单人</a>&nbsp;</td>
             <td><a  href="javascript:void(0);"  target="_blank"  onclick="changeMobilePhoneToEdit('${item.orderId!}')">修改开单人</a>&nbsp;</td>
         </tr>
         </tr>
         </#list>
         </#list>