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

Skip to content

L
liquidnet-bus-v1
Commit 02ea7b81 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

完善 提审 和 搜索

parent 6bd43a8b
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 63 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java
View file @ 02ea7b81
...@@ -5,18 +5,22 @@ import com.liquidnet.client.admin.common.core.controller.BaseController; ...@@ -5,18 +5,22 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult; import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderRefundsServiceImpl; import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderRefundsServiceImpl;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderTicketsAdminServiceImpl;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst; import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dao.OrderRefundDao; import com.liquidnet.service.kylin.dao.OrderRefundDao;
import com.liquidnet.service.kylin.dto.param.RefundApplyParam; import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
import com.liquidnet.service.kylin.dto.param.RefundCallbackParam; import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
import com.liquidnet.service.kylin.dto.param.RefundSearchParam; import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundsVo; import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundsVo;
import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.websocket.server.PathParam;
/** /**
* <p> * <p>
* 后台单订单退款 服务实现类 * 后台单订单退款 服务实现类
...@@ -35,6 +39,9 @@ public class KylinOrderRefundAdminController extends BaseController { ...@@ -35,6 +39,9 @@ public class KylinOrderRefundAdminController extends BaseController {
@Autowired @Autowired
private KylinOrderRefundsServiceImpl kylinOrderRefundsServiceImpl; private KylinOrderRefundsServiceImpl kylinOrderRefundsServiceImpl;
@Autowired
private KylinOrderTicketsAdminServiceImpl kylinOrderTicketsAdminServiceImpl;
@RequiresPermissions("kylin:refund:view") @RequiresPermissions("kylin:refund:view")
@GetMapping() @GetMapping()
public String refund() { public String refund() {
...@@ -64,6 +71,18 @@ public class KylinOrderRefundAdminController extends BaseController { ...@@ -64,6 +71,18 @@ public class KylinOrderRefundAdminController extends BaseController {
return getDataTable(result.getList()); return getDataTable(result.getList());
} }
@GetMapping("applyView")
public String applyView() {
return prefix + "/applyView";
}
@PostMapping("applyOrder")
@ResponseBody
public OrderDetailsVo applyOrder(RefundApplyParam refundApplyParam) {
OrderDetailsVo orderInfo = kylinOrderTicketsAdminServiceImpl.orderDetails(refundApplyParam.getOrderTicketsId());
return orderInfo;
}
@RequiresPermissions("kylin:refund:apply") @RequiresPermissions("kylin:refund:apply")
@PostMapping("apply") @PostMapping("apply")
@ResponseBody @ResponseBody
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundBatchAdminController.java
View file @ 02ea7b81
...@@ -6,9 +6,11 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult; ...@@ -6,9 +6,11 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinRefundPerformancesAdminServiceImpl; import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinRefundPerformancesAdminServiceImpl;
import com.liquidnet.service.kylin.dao.OrderRefundBatchDao; import com.liquidnet.service.kylin.dao.OrderRefundBatchDao;
import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam; import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
import com.liquidnet.service.kylin.dto.param.RefundBatchSearchParam; import com.liquidnet.service.kylin.dto.param.RefundBatchSearchParam;
import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundBatchesVo; import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundBatchesVo;
import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -57,6 +59,17 @@ public class KylinOrderRefundBatchAdminController extends BaseController { ...@@ -57,6 +59,17 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
return getDataTable(result.getList()); return getDataTable(result.getList());
} }
@GetMapping("applyView")
public String applyView() {
return prefix + "/applyView";
}
@PostMapping("applyPerformance")
@ResponseBody
public String applyPerformance(RefundBatchSearchParam refundBatchSearchParam) {
return "error";
}
@RequiresPermissions("kylin:refundBatch:apply") @RequiresPermissions("kylin:refundBatch:apply")
@PostMapping("apply") @PostMapping("apply")
@ResponseBody @ResponseBody
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/applyView.html 0 → 100644
View file @ 02ea7b81
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('提交订单退款')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-post-add">
<div class="form-group">
<label class="col-sm-3 control-label is-required">订单id：</label>
<div class="col-sm-8">
<input th:value="71619365224734720" class="form-control" type="text" name="orderTicketsId" id="orderTicketsId" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">快递费：</label>
<div class="col-sm-8">
<input th:value="0" class="form-control" type="text" name="RefundPriceExpress">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">入场人：</label>
<div class="col-sm-8">
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<textarea name="reason" class="form-control"></textarea>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script type="text/javascript">
var prefix = ctx + "kylin/refund";
$("#form-post-add").validate({
onkeyup: false,
rules:{
orderTicketsId:{
submitHandler: function(form) {
var config = {
url: prefix + "/applyOrder",
type: "post",
dataType: "json",
data: {
"orderTicketsId" : function() {
return $.common.trim($("#orderTicketsId").val());
}
},
beforeSend: function () {
$.modal.loading("正在查询订单，请稍后...");
},
success: function(result) {
$.modal.closeLoading();
console.log(result)
}
};
$.ajax(config)
}
},
},
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/apply", $('#form-post-add').serialize());
}
}
</script>
</body>
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html
View file @ 02ea7b81
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>订单号：</label> <label>票务订单ID：</label>
<input type="text" name="orderTicketsId"/> <input type="text" name="orderTicketsId"/>
</li> </li>
<li> <li>
...@@ -45,6 +45,9 @@ ...@@ -45,6 +45,9 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:refund:apply">
<i class="fa fa-plus"></i> 提交申请
</a>
<a class="btn btn-success multiple disabled" onclick="review()" shiro:hasPermission="kylin:refund:review"> <a class="btn btn-success multiple disabled" onclick="review()" shiro:hasPermission="kylin:refund:review">
批量一审 批量一审
</a> </a>
...@@ -65,31 +68,7 @@ ...@@ -65,31 +68,7 @@
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
<form id="appTest"> <!--审核的弹窗-->
<div class="select-list">
<ul>
<li>
<input type="text" name="orderTicketsId" th:value="71619365224734720"/>
<input type="text" name="orderRefundBatchesId" th:value="222"/>
<input type="text" name="RefundPriceExpress" th:value="0"/>
<input type="text" name="reason" th:value="备注"/>
</li>
<li>
<div class="form-group">
<div class="col-sm-8">
<label class="check-box">
<input checked name="ticketEntityIds" type="checkbox" value="69485706304757740">展开/折叠
</label>
<label class="check-box">
<input checked name="ticketEntityIds" type="checkbox" value="69485706304757739">全选/全不选
</label>
</div>
</div>
</li>
</ul>
</div>
</form>
<div class="wrapper wrapper-content animated fadeInRight ibox-content hidden" id="form-refund-review"> <div class="wrapper wrapper-content animated fadeInRight ibox-content hidden" id="form-refund-review">
<form class="form-horizontal m"> <form class="form-horizontal m">
<div class="row"> <div class="row">
...@@ -118,12 +97,6 @@ ...@@ -118,12 +97,6 @@
var prefix = ctx + "kylin/refund"; var prefix = ctx + "kylin/refund";
function apply() {
var data = $('#appTest').serializeArray();
$.operate.save(prefix + "/apply", data);
}
function review(id) { function review(id) {
var data = ''; var data = '';
if (id) { if (id) {
...@@ -212,6 +185,7 @@ ...@@ -212,6 +185,7 @@
$(function () { $(function () {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/applyView",
detailUrl: prefix + "/details/{id}", detailUrl: prefix + "/details/{id}",
cancelUrl: prefix + "/cancel", cancelUrl: prefix + "/cancel",
reapplyUrl: prefix + "/reapply", reapplyUrl: prefix + "/reapply",
...@@ -254,9 +228,6 @@ ...@@ -254,9 +228,6 @@
actions.push('<a class="btn btn-primary btn-xs ' + executeFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.orderRefundsId + '\')"></i>二审</a> '); actions.push('<a class="btn btn-primary btn-xs ' + executeFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.orderRefundsId + '\')"></i>二审</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定取消退款申请吗？\', table.options.cancelUrl)"></i>取消</a> '); actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定取消退款申请吗？\', table.options.cancelUrl)"></i>取消</a> ');
actions.push('<a class="btn btn-warning btn-xs ' + reapplyFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定重新提交退款审核吗？\', table.options.reapplyUrl)"></i>重新提交</a> '); actions.push('<a class="btn btn-warning btn-xs ' + reapplyFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定重新提交退款审核吗？\', table.options.reapplyUrl)"></i>重新提交</a> ');
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="apply()"></i>提交申请</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refundBatch/applyView.html 0 → 100644
View file @ 02ea7b81
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('提交演出退款')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-post-add">
<div class="form-group">
<label class="col-sm-3 control-label is-required">演出id：</label>
<div class="col-sm-8">
<input th:value="67689474263547904" class="form-control" type="text" name="targetId" id="targetId" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">演出名称：</label>
<div class="col-sm-8">
<input th:value="0" class="form-control" type="text" name="title">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">演出统计：</label>
<div class="col-sm-8">
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<textarea name="reason" class="form-control"></textarea>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script type="text/javascript">
var prefix = ctx + "kylin/refundBatch";
$("#form-post-add").validate({
onkeyup: false,
rules:{
targetId:{
submitHandler: function(form) {
var config = {
url: prefix + "/applyPerformance",
type: "post",
dataType: "json",
data: {
"performancesId" : function() {
return $.common.trim($("#targetId").val());
}
},
beforeSend: function () {
$.modal.loading("正在查询订单，请稍后...");
},
success: function(result) {
$.modal.closeLoading();
console.log(result)
}
};
$.ajax(config)
}
},
},
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/apply", $('#form-post-add').serialize());
}
}
</script>
</body>
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refundBatch/refundBatch.html
View file @ 02ea7b81
...@@ -10,10 +10,6 @@ ...@@ -10,10 +10,6 @@
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li>
<label>退款Id：</label>
<input type="text" name="refundBatchId"/>
</li>
<li> <li>
<label>演出Id：</label> <label>演出Id：</label>
<input type="text" name="targetId"/> <input type="text" name="targetId"/>
...@@ -42,8 +38,8 @@ ...@@ -42,8 +38,8 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="apply()" shiro:hasPermission="kylin:refundBatch:apply"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:refundBatch:apply">
添加 <i class="fa fa-plus"></i> 提交申请
</a> </a>
</div> </div>
...@@ -51,17 +47,7 @@ ...@@ -51,17 +47,7 @@
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
<form id="appTest"> <!--审核的弹窗-->
<div class="select-list">
<ul>
<li>
<input type="text" name="targetId" th:value="67689474263547904"/>
<input type="text" name="reason" th:value="222"/>
</li>
</ul>
</div>
</form>
<div class="wrapper wrapper-content animated fadeInRight ibox-content hidden" id="form-refund-review"> <div class="wrapper wrapper-content animated fadeInRight ibox-content hidden" id="form-refund-review">
<form class="form-horizontal m"> <form class="form-horizontal m">
<div class="row"> <div class="row">
...@@ -90,12 +76,6 @@ ...@@ -90,12 +76,6 @@
var prefix = ctx + "kylin/refundBatch"; var prefix = ctx + "kylin/refundBatch";
function apply() {
var data = $('#appTest').serializeArray();
$.operate.save(prefix + "/apply", data);
}
function review(id) { function review(id) {
data = {"refundBatchId": id}; data = {"refundBatchId": id};
layer.open({ layer.open({
...@@ -168,6 +148,7 @@ ...@@ -168,6 +148,7 @@
$(function () { $(function () {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/applyView",
detailUrl: prefix + "/details/{id}", detailUrl: prefix + "/details/{id}",
cancelUrl: prefix + "/cancel", cancelUrl: prefix + "/cancel",
reapplyUrl: prefix + "/reapply", reapplyUrl: prefix + "/reapply",
......
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 @ 02ea7b81
...@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper; ...@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils; import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.kylin.constant.KylinRedisConst; import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst; import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
...@@ -213,7 +214,7 @@ public class KylinRefundPerformancesAdminServiceImpl { ...@@ -213,7 +214,7 @@ 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());
List<OrderRefundBatchDao> voList = kylinOrderRefundBatchesMapper.misRefundBatchList(); List<OrderRefundBatchDao> voList = kylinOrderRefundBatchesMapper.misRefundBatchList(BeanUtil.convertBeanToMap(refundBatchSearchParam));
pageInfoTmp = new PageInfo(voList); pageInfoTmp = new PageInfo(voList);
} catch (Exception e) { } catch (Exception e) {
return null; return null;
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderRefundBatchesMapper.java
View file @ 02ea7b81
...@@ -5,6 +5,7 @@ import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches; ...@@ -5,6 +5,7 @@ import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
...@@ -16,5 +17,5 @@ import java.util.List; ...@@ -16,5 +17,5 @@ import java.util.List;
*/ */
public interface KylinOrderRefundBatchesMapper extends BaseMapper<KylinOrderRefundBatches> { public interface KylinOrderRefundBatchesMapper extends BaseMapper<KylinOrderRefundBatches> {
List<OrderRefundBatchDao> misRefundBatchList(); List<OrderRefundBatchDao> misRefundBatchList(Map<String,Object> map);
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundBatchesMapper.xml
View file @ 02ea7b81
...@@ -5,5 +5,13 @@ ...@@ -5,5 +5,13 @@
<select id="misRefundBatchList" resultType="com.liquidnet.service.kylin.dao.OrderRefundBatchDao"> <select id="misRefundBatchList" resultType="com.liquidnet.service.kylin.dao.OrderRefundBatchDao">
SELECT * SELECT *
FROM kylin_order_refund_batches FROM kylin_order_refund_batches
<where>
<if test="targetId!=''">
AND target_id = #{targetId}
</if>
<if test="status!=''">
AND status = #{status}
</if>
</where>
</select> </select>
</mapper> </mapper>
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml
View file @ 02ea7b81
...@@ -38,13 +38,13 @@ ...@@ -38,13 +38,13 @@
FROM kylin_order_refunds FROM kylin_order_refunds
<where> <where>
<if test="orderTicketsId!=''"> <if test="orderTicketsId!=''">
AND ps.order_tickets_id = #{orderTicketsId} AND order_tickets_id = #{orderTicketsId}
</if> </if>
<if test="orderRefundCode!=''"> <if test="orderRefundCode!=''">
AND ps.order_refund_code = #{orderRefundCode} AND order_refund_code = #{orderRefundCode}
</if> </if>
<if test="status!=''"> <if test="status!=''">
AND ps.status = #{status} AND status = #{status}
</if> </if>
</where> </where>
</select> </select>
......
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