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

Skip to content

L
liquidnet-bus-v1
Commit 95327d40 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

refund admin list

parent ba759ef9
Hide whitespace changes
Inline Side-by-side
Showing with 252 additions and 28 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/RefundSearchParam.java 0 → 100644
View file @ 95327d40
package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 退款回掉参数
* </p>
*
* @author jiangxiulong
* @since 2021-05-31 11:19 上午
*/
@Data
public class RefundSearchParam implements Serializable {
private String orderTicketsId;
private String orderRefundCode;
private Integer status;
@ApiModelProperty(value = "页数", example = "0")
@NotNull(message = "不能为空")
private Integer pageSize;
@ApiModelProperty(value = "数量", example = "20")
@NotNull(message = "不能为空")
private Integer pageNum;
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html 0 → 100644
View file @ 95327d40
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('退款列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>订单号：</label>
<input type="text" name="orderTicketsId"/>
</li>
<li>
<label>退款编号：</label>
<input type="text" name="orderRefundCode"/>
</li>
<li>
<label>退款状态：</label>
<select name="status">
<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="3">正在退款</option>
<option value="4">完成退款</option>
<option value="6">退款失败</option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:add">
<i class="fa fa-plus"></i> 批量一审
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="kylin:performances:edit">
<i class="fa fa-edit"></i> 批量二审
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="kylin:performances:remove">
<i class="fa fa-remove"></i> 批量取消
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:performances:export">
<i class="fa fa-download"></i> 批量重新提交
</a>
</div>
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]];
var prefix = ctx + "kylin/refund";
$(function() {
var options = {
url: prefix + "/list",
detailUrl: prefix + "/details/{id}",
modalName: "退款详情",
columns: [{
checkbox: true
},
{
field: 'orderTicketsId',
title: '票务订单id'
},
{
field: 'title',
title: '演出名称'
},
{
field: 'price',
title: '退款金额'
},
{
field: 'statusName',
title: '退款状态'
},
{
field: 'createdAt',
title: '申请时间'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"><i class="fa fa-edit"></i>查看</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"><i class="fa fa-edit"></i>一审</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"><i class="fa fa-edit"></i>二审</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"><i class="fa fa-edit"></i>取消</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.orderRefundsId + '\')"><i class="fa fa-edit"></i>重新提交</a> ');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinOrderRefundsServiceImpl.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
View file @ 95327d40
package com.liquidnet.service.kylin.service.impl.admin;
package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dao.OrderRefundDao;
import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundsVo;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import com.liquidnet.service.kylin.mapper.KylinOrderRefundsMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
......@@ -186,7 +186,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
public KylinOrderRefundsVo detail(String orderRefundId) {
KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(
new UpdateWrapper<KylinOrderRefunds>()
new QueryWrapper<KylinOrderRefunds>()
.eq("order_refunds_id", orderRefundId)
);
KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
......@@ -195,14 +195,18 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
return kylinOrderRefundsVo;
}
public PageInfo<OrderRefundDao> refundList(Integer page, Integer size) {
public PageInfo<OrderRefundDao> refundList(RefundSearchParam refundSearchParam) {
PageInfo<OrderRefundDao> pageInfoTmp = null;
try {
PageHelper.startPage(page, size);
List<OrderRefundDao> voList = kylinOrderRefundsMapper.misRefundList();
PageHelper.startPage(refundSearchParam.getPageNum(), refundSearchParam.getPageSize());
List<OrderRefundDao> voList = kylinOrderRefundsMapper.misRefundList(BeanUtil.convertBeanToMap(refundSearchParam));
for (OrderRefundDao item : voList) {
item.setStatusName(item.getStatus());
}
pageInfoTmp = new PageInfo(voList);
} catch (Exception e) {
return null;
e.printStackTrace();
return new PageInfo();
}
return pageInfoTmp;
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinRefundExecuteServiceImpl.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundExecuteServiceImpl.java
View file @ 95327d40
package com.liquidnet.service.kylin.service.impl.admin;
package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import com.liquidnet.service.kylin.mapper.KylinOrderRefundsMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinRefundPerformancesAdminServiceImpl.java → 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 @ 95327d40
package com.liquidnet.service.kylin.service.impl.admin;
package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
......@@ -8,19 +8,15 @@ import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dao.OrderRefundBatchDao;
import com.liquidnet.service.kylin.dao.OrderRefundDao;
import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundBatchesVo;
import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundsVo;
import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinRefundsStatusServiceImpl.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java
View file @ 95327d40
package com.liquidnet.service.kylin.service.impl.admin;
package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fasterxml.jackson.databind.JsonNode;
import com.liquidnet.client.admin.common.utils.StringUtils;
import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils;
......@@ -11,16 +13,17 @@ import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
import com.liquidnet.service.kylin.dto.vo.KylinOrderTicketEntitiesVo;
import com.liquidnet.service.kylin.dto.vo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import com.liquidnet.service.kylin.mapper.KylinOrderRefundsMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketStatusMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import com.liquidnet.service.kylin.utils.DataUtils;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
import org.apache.commons.lang.StringUtils;
import org.apache.http.HttpException;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -100,7 +103,7 @@ public class KylinRefundsStatusServiceImpl {
throw new HttpException("快递费不能大于实际的快递费");
}
// 该订单正在退款或已有退款
QueryWrapper<com.liquidnet.service.kylin.entity.KylinOrderRefunds> refundingCountQuery = new QueryWrapper<KylinOrderRefunds>()
QueryWrapper<KylinOrderRefunds> refundingCountQuery = new QueryWrapper<KylinOrderRefunds>()
.eq("order_tickets_id", orderTicketsId)
.ne("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL);
for (JsonNode v : ticketEntityIds) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
View file @ 95327d40
......@@ -45,6 +45,17 @@ public class DataUtils {
return (int) redisUtil.get(KylinRedisConst.PERFORMANCES_INVENTORY + ticketId + ":" + KylinRedisConst.SURPLUS_GENERAL);
}
/**
* 修改普通库存 并 返回修改后的数量
*
* @param ticketId 票id
* @param surplusGeneral 普通库存
* @return 普通剩余库存
*/
public int changeSurplusGeneral(String ticketId, int surplusGeneral) {
return (int) redisUtil.incr(KylinRedisConst.PERFORMANCES_INVENTORY + ticketId + ":" + KylinRedisConst.SURPLUS_GENERAL, surplusGeneral);
}
/**
* 初始化兑换库存
*
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java
View file @ 95327d40
......@@ -28,6 +28,7 @@ public class OrderRefundDao implements Serializable {
private BigDecimal price;
private Integer status;
private String statusName;
private Integer type;
......@@ -59,7 +60,40 @@ public class OrderRefundDao implements Serializable {
private String orderTicketEntitiesIds;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
private String createdAt;
private String updatedAt;
public void setStatusName(Integer status){
this.status=status;
switch (status){
case 0:
this.statusName="请求退款";
break;
case 1:
this.statusName="审核通过";
break;
case 2:
this.statusName="取消退款";
break;
case 3:
this.statusName="正在退款";
break;
case 4:
this.statusName="完成退款";
break;
case 5:
this.statusName="驳回退款";
break;
case 6:
this.statusName="退款失败";
break;
case 7:
this.statusName="等待退款";
break;
default:
this.statusName="其他";
break;
}
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderRefundsMapper.java
View file @ 95327d40
......@@ -5,6 +5,7 @@ import com.liquidnet.service.kylin.dao.OrderRefundDao;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import java.util.List;
import java.util.Map;
/**
* <p>
......@@ -20,5 +21,5 @@ public interface KylinOrderRefundsMapper extends BaseMapper<KylinOrderRefunds> {
double refundedTotalPrice(String orderTicketsId);
List<OrderRefundDao> misRefundList();
List<OrderRefundDao> misRefundList(Map<String,Object> map);
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml
View file @ 95327d40
......@@ -26,8 +26,26 @@
</where>
LIMIT #{limitNum}
</select>
<select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao">
<resultMap id="misRefundListResult" type="com.liquidnet.service.kylin.dao.OrderRefundDao">
<result column="order_tickets_id" property="orderTicketsId"/>
<result column="order_refund_code" property="orderRefundCode"/>
<result column="status" property="status"/>
<result column="price" property="price"/>
<result column="created_at" property="createdAt"/>
</resultMap>
<select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
SELECT *
FROM kylin_order_refunds
<where>
<if test="orderTicketsId!=''">
AND ps.order_tickets_id = #{orderTicketsId}
</if>
<if test="orderRefundCode!=''">
AND ps.order_refund_code = #{orderRefundCode}
</if>
<if test="status!=''">
AND ps.status = #{status}
</if>
</where>
</select>
</mapper>
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