voucher list and export

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

+package com.ctrip.fun.admin.service.basic;
+
+import java.util.ArrayList;
+
+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.web.client.RestClientException;
+
+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 {
+
+    private static final Logger logger = LoggerFactory.getLogger(VoucherService.class);
+
+	public PagedResponseBean<VoucherItemDTO> queryListForFinance(VoucherQueryFormDTO query) {
+		PagedResponseBean<VoucherItemDTO> responseBean = new PagedResponseBean<VoucherItemDTO>(0, new ArrayList<VoucherItemDTO>());
+//        String uri = super.getServiceUri("uri.Voucher.queryUnusedListForOp");
+		String uri = super.getServiceUri("uri.voucher.queryListForFinance");
+        Request<VoucherQueryFormDTO> request = new Request<VoucherQueryFormDTO>("", query);
+
+        HttpEntity<Request<VoucherQueryFormDTO>> entity = new HttpEntity<Request<VoucherQueryFormDTO>>(request);
+
+        Response<PagedResponseBean<VoucherItemDTO>> response = null;
+        try {
+            response = super.exchange(uri, HttpMethod.POST, entity,
+                    new ParameterizedTypeReference<Response<PagedResponseBean<VoucherItemDTO>>>() {
+                    }).getBody();
+        } catch (RestClientException e) {
+            logger.error(e.getMessage());
+        }
+
+       /* if (null != response && response.getStatus() == ResponseStatusEnum.SUCCESS.getValue()) {
+            responseBean = response.getBody();
+        } else {
+            logger.error("{} status: {}, msg: {}", "获取现金券规则列表异常", response.getStatus(),
+                    response.getMessage());
+        }*/
+
+        return response.getBody();
+	}
+
+    /**
+     * 获取现金券规则列表
+     *//*
+    public PagedResponseBean<VoucherRuleBean> queryList(VoucherRuleQuery query) {
+        PagedResponseBean<VoucherRuleBean> responseBean = new PagedResponseBean<VoucherRuleBean>(0,
+                new ArrayList<VoucherRuleBean>());
+        String uri = super.getServiceUri("uri.voucherRule.queryList");
+
+        Request<VoucherRuleQuery> request = new Request<VoucherRuleQuery>("", query);
+
+        HttpEntity<Request<VoucherRuleQuery>> entity = new HttpEntity<Request<VoucherRuleQuery>>(
+                request);
+
+        Response<PagedResponseBean<VoucherRuleBean>> response = null;
+        try {
+            response = super.exchange(uri, HttpMethod.POST, entity,
+                    new ParameterizedTypeReference<Response<PagedResponseBean<VoucherRuleBean>>>() {
+                    }).getBody();
+        } catch (RestClientException e) {
+            logger.error(e.getMessage());
+        }
+
+        if (null != response && response.getStatus() == ResponseStatusEnum.SUCCESS.getValue()) {
+            responseBean = response.getBody();
+        } else {
+            logger.error("{} status: {}, msg: {}", "获取现金券规则列表异常", response.getStatus(),
+                    response.getMessage());
+        }
+
+        return responseBean;
+    }
+
+    *//**
+     * 修改现金券发放规则
+     * 
+     *//*
+    public boolean modifyVoucherRule(String uid, VoucherRuleVO vo) {
+        String uri = super.getServiceUri("uri.voucherRule.modify");
+        Request<VoucherRuleVO> request = new Request<VoucherRuleVO>("", vo);
+        HttpEntity<Request<VoucherRuleVO>> entity = new HttpEntity<Request<VoucherRuleVO>>(request);
+        Response<Boolean> response = null;
+        try {
+            response = super.exchange(uri, HttpMethod.POST, entity,
+                    new ParameterizedTypeReference<Response<Boolean>>() {
+                    }).getBody();
+        } catch (RestClientException e) {
+            logger.error(e.getMessage());
+        }
+        if (null != response && response.getStatus() == ResponseStatusEnum.SUCCESS.getValue()) {
+            return response.getBody();
+        } else {
+            logger.error("{} status: {}, msg: {}", "修改现金券发放规则异常", response.getStatus(),
+                    response.getMessage());
+        }
+        return false;
+
+    }
+
+    *//**
+     * 增加现金券规则
+     *//*
+    public boolean saveVoucherRule(String uid, VoucherRuleBean bean) {
+        String uri = super.getServiceUri("uri.voucherRule.add");
+        boolean success = true;
+        Request<VoucherRuleBean> request = new Request<VoucherRuleBean>(uid, bean);
+        HttpEntity<Request<VoucherRuleBean>> entity = new HttpEntity<Request<VoucherRuleBean>>(
+                request);
+        Response<Integer> response = super.exchange(uri, HttpMethod.POST, entity,
+                new ParameterizedTypeReference<Response<Integer>>() {
+                }).getBody();
+        if (response == null || response.getStatus() != ResponseStatusEnum.SUCCESS.getValue()) {
+            success = false;
+            logger.error("增加现金券规则失败");
+        }
+        return success;
+    }
+
+    *//**
+     * 增加现金券规则
+     *//*
+    public VoucherRuleBean getById(Integer id) {
+        String uri = super.getServiceUri("uri.voucherRule.get");
+        VoucherRuleBean bean = new VoucherRuleBean();
+        Request<Integer> request = new Request<Integer>("", id);
+        HttpEntity<Request<Integer>> entity = new HttpEntity<Request<Integer>>(request);
+        Response<VoucherRuleBean> response = super.exchange(uri, HttpMethod.POST, entity,
+                new ParameterizedTypeReference<Response<VoucherRuleBean>>() {
+                }).getBody();
+        if (response != null && response.getStatus() == ResponseStatusEnum.SUCCESS.getValue()) {
+            bean = response.getBody();
+        } else {
+            logger.error("获取现金券详细失败");
+        }
+        return bean;
+    }
+
+    *//**
+     * 修改现金券状态
+     *//*
+    public boolean updateValidFlag(String uid, VoucherRuleBean bean) {
+        String uri = super.getServiceUri("uri.voucherRule.updateValidFlag");
+        boolean success = true;
+        Request<VoucherRuleBean> request = new Request<VoucherRuleBean>(uid, bean);
+        HttpEntity<Request<VoucherRuleBean>> entity = new HttpEntity<Request<VoucherRuleBean>>(
+                request);
+        Response<Integer> response = super.exchange(uri, HttpMethod.POST, entity,
+                new ParameterizedTypeReference<Response<Integer>>() {
+                }).getBody();
+        if (response == null || response.getStatus() != ResponseStatusEnum.SUCCESS.getValue()) {
+            success = false;
+            logger.error("增加现金券修改失败");
+        }
+        return success;
+    }
+
+    *//**
+     * @param id
+     * @param userIds
+     *//*
+    public Response<Boolean>  addVourcherRoleUsers(int id, String userids) {
+        String uri = super.getServiceUri("uri.voucherRule.addVoucherRoleUsers").replace("{id}",
+                String.valueOf(id));
+        Request<String> request = new Request<String>("", userids);
+        HttpEntity<Request<String>> entity = new HttpEntity<Request<String>>(request);
+        Response<Boolean> response = super.exchange(uri, HttpMethod.POST, entity,
+                new ParameterizedTypeReference<Response<Boolean>>() {
+                }).getBody();
+        return response;
+    }*/
+}

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

@@ -50,6 +50,7 @@
 		<sec:intercept-url pattern="/tourFinance/**" access="ROLE_FINANCE" />
 		<sec:intercept-url pattern="/insuranceFinance/**" access="ROLE_FINANCE" />
 		<sec:intercept-url pattern="/voucherRule/**" access="ROLE_VOUCHER" />
+		<sec:intercept-url pattern="/voucher/**" access="ROLE_VOUCHER" />
 		<sec:intercept-url pattern="/insideSms/**" access="ROLE_INSIDESMS" />
 		<sec:intercept-url pattern="/telTask/create" access="ROLE_TEL_ADMIN"/>
         <sec:intercept-url pattern="/telTask/unbindTelTaskDetail" access="ROLE_TEL_ADMIN"/>

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

@@ -299,6 +299,9 @@
 	<bean name="luckParticipateExcelService"
 		class="com.ctrip.fun.admin.service.basic.luck.LuckParticipateExcelService"
 		parent="abstractExcelExportService1" />
+	<bean name="voucherService"
+		class="com.ctrip.fun.admin.service.basic.VoucherService"
+		parent="baseService" />
 
 	<!-- Tee time -->
 	<bean name="teeTimeService" class="com.ctrip.fun.admin.service.golf.TeeTimeService"

src/main/resources/properties/service.properties

@@ -18,6 +18,8 @@ uri.Voucher.QueryVoucherList=/fun-golf-service/Voucher/QueryVoucherList
 uri.Voucher.queryUnusedListForOp=/fun-golf-service/Voucher/queryUnusedListForOp
 uri.Voucher.deleteUserVoucher=/fun-golf-service/Voucher/deleteUserVoucher
 
+uri.voucher.queryListForFinance=/fun-golf-service/Voucher/queryListForFinance
+
 #admin user
 uri.adminUser.userDetail=/fun-golf-service/adminUser/userDetail
 uri.adminUser.updatePassword=/fun-golf-service/adminUser/update

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

+<#assign pageJsContent>
+<script>
+<@flash_message />
+
+
+	function exportVoucher(){
+		$.get("/voucher/export",{},function(data){
+			
+		});
+		
+	}
+	
+</script>
+</#assign>
+<#assign pageCssContent>
+<style>
+    .table th, .table td{ text-align:center;vertical-align:middle;}
+    .widthShow {
+		width: 1100px;
+	}
+</style>
+</#assign>
+
+<@com.layout title="查询现金券规则" module="marketing" current="voucher_list" pageCss=pageCssContent pageJs=pageJsContent>
+<form class="form-inline search-box widthShow" action="" method="get" autocomplete="off" >
+    
+    <@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"] "" "现金券状态"/>
+    
+    
+    
+    
+    <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>
+<table class="table table-bordered table-striped widthShow">
+    <thead>
+    <tr>
+        <th style="width:5%">ID</th>
+        <th style="width:5%">类型</th>
+        <th style="width:10%">持有人uid</th>
+        <th style="width:5%">金额</th>
+        <th style="width:15%">有效期</th>
+        <th style="width:5%">使用状况</th>
+        <th style="width:10%">备注</th>
+        <th style="width:7%">券名称</th>
+        <th style="width:10%">操作</th>
+    </tr>
+    </thead>
+    <tbody>
+        <#list list as item>
+        <tr>
+            <td>${item.id!}</td>
+            <td>${item.type!}</td>
+            <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>${item.remark!}</td>
+            <td><a href="/voucherRule/update?id=${item.ruleId!}&page=${paginationData.pageNumber!}">${item.description!}</a></td>
+            <td>操作</td>
+        </tr>
+        </#list>
+    </tbody>
+</table>
+
+<div class="pagination pagination-right widthShow">
+    <ul>
+        <@paginator.first />
+        <@paginator.previous />
+        <@paginator.numbers separator=""/>
+        <@paginator.next />
+        <@paginator.last />
+    </ul>
+    <@paginator.statistics />
+</div>
+
+</@com.layout>
\ No newline at end of file

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

@@ -434,7 +434,7 @@ $(function(){
                 			<tbody>
                 			
                 			<#if dto.multipleCourseConditionBean??>
-	                			<#if dto.multipleCourseConditionBean.conditionList?? && dto.multipleCourseConditionBean.conditionList?size>0>
+	                			<#if (dto.multipleCourseConditionBean.conditionList?? && dto.multipleCourseConditionBean.conditionList?size>0) >
 	                			<#list dto.multipleCourseConditionBean.conditionList as item>
 	                			<tr>
 	                				<td><input type="checkbox"   name="conditionCheck"/></td>

src/main/webapp/WEB-INF/templates/common/layout.ftl

@@ -252,6 +252,9 @@ ${pageCss}
                     <li <#if current == "voucherRule_list">class="active"</#if>>
                         <a href="/voucherRule/queryList">列表</a>
                     </li>
+                    <li <#if current == "voucher_list">class="active"</#if>>
+                        <a href="/voucher/queryList">使用列表</a>
+                    </li>
                     
                     <li class="nav-header">签到</li>
                     <li <#if current == "sign_get">class="active"</#if>>