未使用抵用券列表及导出功能

src/main/java/com/ctrip/fun/admin/service/basic/VoucherExcelService.java

+package com.ctrip.fun.admin.service.basic;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestClientException;
+
+import com.ctrip.fun.admin.utility.AbstractExcelExportService;
+import com.ctrip.fun.common.vo.Request;
+import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.basic.VoucherItemDTO;
+import com.ctrip.fun.common.vo.basic.VoucherQueryFormDTO;
+
+
+public class VoucherExcelService extends AbstractExcelExportService<VoucherQueryFormDTO, VoucherItemDTO> {
+
+    private static Logger logger = LoggerFactory.getLogger(VoucherExcelService.class);
+    
+	@Override
+	public Class<VoucherItemDTO> getTClass() {
+		return VoucherItemDTO.class;
+	}
+
+	@Override
+	public List<VoucherItemDTO> list(String userId, VoucherQueryFormDTO query) {
+		
+		String uri = super.getServiceUri("uri.voucher.exportVoucherExcel");
+		
+        Request<VoucherQueryFormDTO> request = new Request<VoucherQueryFormDTO>("", query);
+
+		HttpEntity<Request<VoucherQueryFormDTO>> entity = new HttpEntity<Request<VoucherQueryFormDTO>>(request);
+        Response<Collection<VoucherItemDTO>> response = null;
+		try {
+            response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<Collection<VoucherItemDTO>>>() {
+			}).getBody();
+		} catch (RestClientException e) {
+			logger.error(e.getMessage());
+		}
+
+        List<VoucherItemDTO> responseBean = null;
+		if (response != null) {
+			if (response.getStatus() == 1) {
+                responseBean = (List<VoucherItemDTO>) response.getBody();
+			} else {
+				logger.error(String.format("[list] status: %d, msg: %s", response.getStatus(), response.getMessage()));
+                responseBean = new ArrayList<VoucherItemDTO>();
+			}
+		}
+
+        return responseBean;
+		
+		
+	}
+
+}

src/main/java/com/ctrip/fun/admin/service/basic/VoucherService.java

@@ -13,11 +13,8 @@ import com.ctrip.fun.admin.service.BaseService;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.Request;
 import com.ctrip.fun.common.vo.Response;
-import com.ctrip.fun.common.vo.basic.VoucherBean;
 import com.ctrip.fun.common.vo.basic.VoucherItemDTO;
-import com.ctrip.fun.common.vo.basic.VoucherQueryDto;
 import com.ctrip.fun.common.vo.basic.VoucherQueryFormDTO;
-import com.ctrip.fun.common.vo.basic.VoucherQueryRequestDTO;
 
 public class VoucherService extends BaseService {
 

src/main/resources/config/spring-service.xml

@@ -302,6 +302,7 @@
 	<bean name="voucherService"
 		class="com.ctrip.fun.admin.service.basic.VoucherService"
 		parent="baseService" />
+	<bean name="voucherExcelService"  class="com.ctrip.fun.admin.service.basic.VoucherExcelService" parent="abstractExcelExportService" />
 
 	<!-- Tee time -->
 	<bean name="teeTimeService" class="com.ctrip.fun.admin.service.golf.TeeTimeService"

src/main/resources/properties/service.properties

@@ -19,6 +19,7 @@ uri.Voucher.queryUnusedListForOp=/fun-golf-service/Voucher/queryUnusedListForOp
 uri.Voucher.deleteUserVoucher=/fun-golf-service/Voucher/deleteUserVoucher
 
 uri.voucher.queryListForFinance=/fun-golf-service/Voucher/queryListForFinance
+uri.voucher.exportVoucherExcel=/fun-golf-service/Voucher/exportVoucherExcel
 
 #admin user
 uri.adminUser.userDetail=/fun-golf-service/adminUser/userDetail

src/main/webapp/WEB-INF/templates/basic/voucher/list.ftl

@@ -26,11 +26,22 @@
     
     <@com.textInput "dto.uid" "style=\"margin-left: 5px;\"" "UID"/>
     <@com.textInput "dto.description" "style=\"margin-left: 5px;\"" "券描述"/>
-    <@com.singleSelectQuery "dto.used" enums["com.ctrip.fun.common.vo.order.VourcherStatusEnum"] "" "现金券状态"/>
-    
-    
-    
-    
+  
+    <div class="short_content_div"> 
+		<label class="control-label" for="used" style="margin-left: 5px;">使用状态</label>
+		<select id="used" name="used">
+    	    <option value="-1">全部</option>
+    		<#list voucherUsedEnum as item>
+    		
+    		<#if (dto.used?? && dto.used==item.getKey())>
+    		<option value="${item.getKey()}" selected="selected">${item.getValue()}</option>
+    		<#else>
+    		<option value="${item.getKey()}">${item.getValue()}</option>
+    		</#if>
+    		</#list>
+    	</select>
+    </div>
+
     <button type="submit" class="btn btn-primary">查询</button>
     <button type="button" class="btn btn-success" onclick="javascript:location.href='/voucher/excel/export';" style="margin-left:20px;">导出</button>
 </form>
@@ -56,7 +67,11 @@
             <td>${item.uid!}</td>
             <td>${item.amount!}</td>
             <td>${item.startUseDate?string("yyyy-MM-dd")} ~ ${item.endUseDate?string("yyyy-MM-dd")}</td>
-            <td>${item.used!} ${item.useDate!}  </td>
+            <td> 
+            
+            <#if item.used==0>未使用<#elseif item.used==1>已使用</#if>
+            <#if item.useDate??>${item.useDate?string("yyyy-MM-dd")}  </#if>
+            </td>
             <td>${item.remark!}</td>
             <td><a href="/voucherRule/update?id=${item.ruleId!}&page=${paginationData.pageNumber!}">${item.description!}</a></td>
             <td>操作</td>