记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 780e39e6 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

热款列表权限展示状态

parent b0064382
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 25 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundBatchSearchParam.java
View file @ 780e39e6
...@@ -5,6 +5,7 @@ import lombok.Data; ...@@ -5,6 +5,7 @@ import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* <p> * <p>
...@@ -21,7 +22,8 @@ public class RefundBatchSearchParam implements Serializable { ...@@ -21,7 +22,8 @@ public class RefundBatchSearchParam implements Serializable {
private String targetId; private String targetId;
private Integer status; private String status;
private List<String> statusStr;
private String createdAt; private String createdAt;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html
View file @ 780e39e6
...@@ -24,31 +24,41 @@ ...@@ -24,31 +24,41 @@
<shiro:hasRole name="admin"> <shiro:hasRole name="admin">
<option value="">全部</option> <option value="">全部</option>
</shiro:hasRole> <option value="0">请求退款</option>
<shiro:hasPermission name="kylin:refund:apply">
<shiro:lacksRole name="admin">
<option value="888,2,5,7,3,4,6">全部</option>
</shiro:lacksRole>
<option value="888">请求退款</option>
<option value="2">取消退款</option> <option value="2">取消退款</option>
<option value="1">一审审核通过</option>
<option value="5">一审驳回退款</option> <option value="5">一审驳回退款</option>
<option value="7">二审通过等待退款</option> <option value="7">二审通过等待退款</option>
<option value="8">二审驳回退款</option>
<option value="3">正在退款</option> <option value="3">正在退款</option>
<option value="4">完成退款</option> <option value="4">完成退款</option>
<option value="6">退款失败</option> <option value="6">退款失败</option>
</shiro:hasRole>
<shiro:hasPermission name="kylin:refund:apply">
<shiro:lacksRole name="admin">
<option value="">全部</option>
<option value="0">请求退款</option>
<option value="2">取消退款</option>
<option value="1">一审审核通过</option>
<option value="5">一审驳回退款</option>
<option value="7">二审通过等待退款</option>
<option value="8">二审驳回退款</option>
<option value="3">正在退款</option>
<option value="4">完成退款</option>
<option value="6">退款失败</option>
</shiro:lacksRole>
</shiro:hasPermission> </shiro:hasPermission>
<shiro:hasPermission name="kylin:refund:review"> <shiro:hasPermission name="kylin:refund:review">
<shiro:lacksRole name="admin"> <shiro:lacksRole name="admin">
<option value="888,8">全部</option> <option value="0,8">全部</option>
<option value="0">请求退款</option>
<option value="8">二审驳回退款</option>
</shiro:lacksRole> </shiro:lacksRole>
<option value="888">请求退款</option>
<option value="8">二审驳回退款</option>
</shiro:hasPermission> </shiro:hasPermission>
<shiro:hasPermission name="kylin:refund:execute"> <shiro:hasPermission name="kylin:refund:execute">
<shiro:lacksRole name="admin"> <shiro:lacksRole name="admin">
<option value="1">全部</option> <option value="1">一审审核通过</option>
</shiro:lacksRole> </shiro:lacksRole>
<option value="1">一审审核通过</option>
</shiro:hasPermission> </shiro:hasPermission>
</select> </select>
</li> </li>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refundBatch/refundBatch.html
View file @ 780e39e6
...@@ -17,13 +17,39 @@ ...@@ -17,13 +17,39 @@
<li> <li>
<label>退款状态：</label> <label>退款状态：</label>
<select name="status"> <select name="status">
<option value="">全部</option> <shiro:hasRole name="admin">
<option value="1">申请退款</option> <option value="">全部</option>
<option value="2">取消退款</option> <option value="1">申请退款</option>
<option value="3">运营驳回审核</option> <option value="2">取消退款</option>
<option value="4">运营通过审核</option> <option value="3">运营驳回审核</option>
<option value="5">财务驳回审核</option> <option value="4">运营通过审核</option>
<option value="6">财务通过审核</option> <option value="5">财务驳回审核</option>
<option value="6">财务通过审核</option>
</shiro:hasRole>
<shiro:hasPermission name="kylin:refundBatch:apply">
<shiro:lacksRole name="admin">
<option value="">全部</option>
<option value="1">申请退款</option>
<option value="2">取消退款</option>
<option value="3">运营驳回审核</option>
<option value="4">运营通过审核</option>
<option value="5">财务驳回审核</option>
<option value="6">财务通过审核</option>
</shiro:lacksRole>
</shiro:hasPermission>
<shiro:hasPermission name="kylin:refundBatch:review">
<shiro:lacksRole name="admin">
<option value="1,5">全部</option>
<option value="1">申请退款</option>
<option value="5">财务驳回审核</option>
</shiro:lacksRole>
</shiro:hasPermission>
<shiro:hasPermission name="kylin:refundBatch:execute">
<shiro:lacksRole name="admin">
<option value="4">全部</option>
<option value="4">运营通过审核</option>
</shiro:lacksRole>
</shiro:hasPermission>
</select> </select>
</li> </li>
<li> <li>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundPerformancesAdminServiceImpl.java
View file @ 780e39e6
...@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service; ...@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -229,6 +230,9 @@ public class KylinRefundPerformancesAdminServiceImpl { ...@@ -229,6 +230,9 @@ public class KylinRefundPerformancesAdminServiceImpl {
PageInfo<OrderRefundBatchDao> pageInfoTmp = null; PageInfo<OrderRefundBatchDao> pageInfoTmp = null;
try { try {
PageHelper.startPage(refundBatchSearchParam.getPageNum(), refundBatchSearchParam.getPageSize()); PageHelper.startPage(refundBatchSearchParam.getPageNum(), refundBatchSearchParam.getPageSize());
if (!refundBatchSearchParam.getStatus().isEmpty()) {
refundBatchSearchParam.setStatusStr(Arrays.asList(refundBatchSearchParam.getStatus().split(",")));
}
List<OrderRefundBatchDao> voList = kylinOrderRefundBatchesMapper.misRefundBatchList(BeanUtil.convertBeanToMap(refundBatchSearchParam)); List<OrderRefundBatchDao> voList = kylinOrderRefundBatchesMapper.misRefundBatchList(BeanUtil.convertBeanToMap(refundBatchSearchParam));
for (OrderRefundBatchDao item : voList) { for (OrderRefundBatchDao item : voList) {
KylinPerformances info = kylinPerformancesMapper.selectOne( KylinPerformances info = kylinPerformancesMapper.selectOne(
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundBatchesMapper.xml
View file @ 780e39e6
...@@ -10,7 +10,10 @@ ...@@ -10,7 +10,10 @@
AND target_id = #{targetId} AND target_id = #{targetId}
</if> </if>
<if test="status!=''"> <if test="status!=''">
AND status = #{status} AND status IN
<foreach collection="statusStr" item="status" index="index" open="(" close=")" separator=",">
${status}
</foreach>
</if> </if>
</where> </where>
ORDER BY mid DESC ORDER BY mid DESC
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml
View file @ 780e39e6
...@@ -48,11 +48,11 @@ ...@@ -48,11 +48,11 @@
<if test="orderCode!=''"> <if test="orderCode!=''">
AND b.order_code = #{orderCode} AND b.order_code = #{orderCode}
</if> </if>
<if test="status!='' and status != 888"> <if test="status!=''">
AND a.status = #{status} AND a.status IN
</if> <foreach collection="statusStr" item="status" index="index" open="(" close=")" separator=",">
<if test="status == 888"> ${status}
AND a.status = 0 </foreach>
</if> </if>
</where> </where>
ORDER BY mid DESC ORDER BY mid DESC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment