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

Commit ede91591 authored by jiangxiulong's avatar jiangxiulong

refund detail list delRefunds

parent d1d5d61f
package com.liquidnet.service.kylin.dto.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* refund batches返回给前端的数据字段
* </p>
*
* @author jiangxiulong
* @since 2021-05-31 11:19 上午
*/
@Data
@ApiModel
public class KylinOrderRefundBatchesVo implements Serializable {
@ApiModelProperty(value = "主键ID")
private String refundBatchId;
@ApiModelProperty(value = "演出id")
private String targetId;
@ApiModelProperty(value = "状态")
private Integer status;
@ApiModelProperty(value = "添加时间")
private LocalDateTime createdAt;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updatedAt;
}
package com.liquidnet.service.kylin.dto.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* <p>
* refund返回给前端的数据字段
* </p>
*
* @author jiangxiulong
* @since 2021-05-31 11:19 上午
*/
@Data
@ApiModel
public class KylinOrderRefundsVo implements Serializable {
@ApiModelProperty(value = "主键ID")
private String orderRefundsId;
@ApiModelProperty(value = "票务订单id")
private String orderTicketsId;
@ApiModelProperty(value = "退款编号")
private String orderRefundCode;
@ApiModelProperty(value = "批量退款id")
private String orderRefundBatchesId;
@ApiModelProperty(value = "退款中心退款编号")
private String refundCode;
@ApiModelProperty(value = "成功退款时间")
private LocalDateTime refundAt;
@ApiModelProperty(value = "第三方退款编号")
private String refundId;
@ApiModelProperty(value = "退款失败原因")
private String refundError;
@ApiModelProperty(value = "退款总金额")
private BigDecimal price;
@ApiModelProperty(value = "退款状态: 0请求退款 2取消退款 1审核通过 5驳回退款 7等待退款 3正在退款 4完成退款 6退款失败")
private Integer status;
@ApiModelProperty(value = "退款差异: 0申请退款返还库存 1自动退款无法取消退款不返还库存")
private Integer type;
@ApiModelProperty(value = "申请人id")
private String applicantId;
@ApiModelProperty(value = "申请人名称")
private String applicantName;
@ApiModelProperty(value = "申请时间")
private LocalDateTime applicantAt;
@ApiModelProperty(value = "退款原因")
private String reason;
@ApiModelProperty(value = "审核人id")
private String auditorId;
@ApiModelProperty(value = "审核人名称")
private String auditorName;
@ApiModelProperty(value = "审核时间")
private LocalDateTime auditorAt;
@ApiModelProperty(value = "驳回原因")
private String reject;
@ApiModelProperty(value = "执行人id")
private String executorId;
@ApiModelProperty(value = "执行人名称")
private String executorName;
@ApiModelProperty(value = "执行时间")
private LocalDateTime executorAt;
@ApiModelProperty(value = "回绝原因")
private String refuse;
@ApiModelProperty(value = "票务/快递费/票和快递费")
private String refundType;
@ApiModelProperty(value = "订单入场人/搭售款式表 id 多个 ,分割")
private String orderTicketEntitiesIds;
@ApiModelProperty(value = "添加时间")
private LocalDateTime createdAt;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updatedAt;
}
package com.liquidnet.service.kylin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.entity.KylinRefundBatches;
import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches;
/**
* <p>
......@@ -11,6 +11,6 @@ import com.liquidnet.service.kylin.entity.KylinRefundBatches;
* @author liquidnet
* @since 2021-05-25
*/
public interface IKylinRefundBatchesService extends IService<KylinRefundBatches> {
public interface IKylinOrderRefundBatchesService extends IService<KylinOrderRefundBatches> {
}
package com.liquidnet.service.kylin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.entity.KylinRefunds;
/**
* <p>
* 退款表 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface IKylinRefundsService extends IService<KylinRefunds> {
}
package com.liquidnet.service.kylin.dao;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
public class OrderRefundDao implements Serializable {
private String orderRefundsId;
private String orderTicketsId;
private String orderRefundCode;
private String orderRefundBatchesId;
private String refundCode;
private LocalDateTime refundAt;
private String refundId;
private String refundError;
private BigDecimal price;
private Integer status;
private Integer type;
private String applicantId;
private String applicantName;
private LocalDateTime applicantAt;
private String reason;
private String auditorId;
private String auditorName;
private LocalDateTime auditorAt;
private String reject;
private String executorId;
private String executorName;
private LocalDateTime executorAt;
private String refuse;
private String refundType;
private String orderTicketEntitiesIds;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
......@@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinRefundBatches implements Serializable {
public class KylinOrderRefundBatches implements Serializable {
private static final long serialVersionUID = 1L;
......
package com.liquidnet.service.kylin.entity;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 退款表
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class KylinRefunds implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Integer mid;
/**
* refunds_id
*/
private String refundsId;
/**
* 商户id
*/
private String merchantId;
/**
* 退款状态: 0请求退款 2取消退款 1审核通过 5驳回退款 7等待退款 3正在退款 4完成退款 6退款失败
*/
private Integer status;
/**
* 退款差异: 0申请退款返还库存 1自动退款无法取消退款不返还库存
*/
private Integer type;
/**
* 订单id
*/
private String orderId;
/**
* 订单类型 order_product 商品订单 , order_ticket 票务订单
*/
private String orderType;
/**
* 订单中心订单号,这里方便查询
*/
private String orderCode;
/**
* 退款内容,演出title,商品title,这里方便查询
*/
private String orderTitle;
/**
* 退款手机号,这里方便查询
*/
private String orderMobile;
/**
* 支付中心支付单号,用于申请退款
*/
private String payCode;
/**
* 退款编号
*/
private String orderRefundCode;
/**
* 退款总金额
*/
private BigDecimal price;
/**
* 退款原因
*/
private String reason;
/**
* 退款备注
*/
private String remark;
/**
* 驳回原因
*/
private String reject;
/**
* 回绝原因
*/
private String refuse;
/**
* 退款中心退款编号
*/
private String refundCode;
/**
* 退款类型
*/
private String refundType;
/**
* 成功退款时间
*/
private LocalDateTime refundAt;
/**
* 第三方退款编号
*/
private String refundId;
/**
* 退款失败原因
*/
private String refundError;
/**
* 申请人id
*/
private Integer applicantId;
/**
* 申请人名称
*/
private String applicantName;
/**
* 申请时间
*/
private LocalDateTime applicantAt;
/**
* 审核人id
*/
private Integer auditorId;
/**
* 审核人名称
*/
private String auditorName;
/**
* 审核时间
*/
private LocalDateTime auditorAt;
/**
* 执行人id
*/
private Integer executorId;
/**
* 执行人名称
*/
private String executorName;
/**
* 执行时间
*/
private LocalDateTime executorAt;
/**
* 批量退款id
*/
private Integer batchId;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
/**
* 支付类型
*/
private String paymentType;
}
package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.entity.KylinRefundBatches;
import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
......@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author liquidnet
* @since 2021-05-25
*/
public interface KylinRefundBatchesMapper extends BaseMapper<KylinRefundBatches> {
public interface KylinOrderRefundBatchesMapper extends BaseMapper<KylinOrderRefundBatches> {
}
package com.liquidnet.service.kylin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.kylin.dao.OrderRefundDao;
import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
import java.util.List;
......@@ -18,4 +19,6 @@ public interface KylinOrderRefundsMapper extends BaseMapper<KylinOrderRefunds> {
List<KylinOrderRefunds> getRefundList(Integer whereType, String refundBatchId, Integer[] whereStatus, int mid, int limitNum);
double refundedTotalPrice(String orderTicketsId);
List<OrderRefundDao> misRefundList();
}
package com.liquidnet.service.kylin.mapper;
import com.liquidnet.service.kylin.entity.KylinRefunds;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* 退款表 Mapper 接口
* </p>
*
* @author liquidnet
* @since 2021-05-26
*/
public interface KylinRefundsMapper extends BaseMapper<KylinRefunds> {
List<KylinRefunds> getRefundList(Integer whereType, String refundBatchId, Integer[] whereStatus, int mid, int limitNum);
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.kylin.mapper.KylinRefundBatchesMapper">
<mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper">
</mapper>
......@@ -26,4 +26,8 @@
</where>
LIMIT #{limitNum}
</select>
<select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao">
SELECT *
FROM kylin_order_refunds
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.kylin.mapper.KylinRefundsMapper">
<select id="getRefundList" resultType="com.liquidnet.service.kylin.entity.KylinRefunds">
SELECT refunds_id
FROM kylin_refunds
<where>
r.performance_id=#{targetId}
AND type=#{whereType}
AND batch_id=#{refundBatchId}
AND o.mid>#{mid}
AND status IN
<foreach collection="whereStatus" item="status" index="index" open="(" close=")" separator=",">
#{status}
</foreach>
</where>
LIMIT #{limitNum}
</select>
</mapper>
package com.liquidnet.service.kylin.controller.admin;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.kylin.dao.OrderRefundDao;
import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundsVo;
import com.liquidnet.service.kylin.service.impl.admin.KylinOrderRefundsServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
......@@ -33,6 +38,38 @@ public class KylinOrderRefundAdminController {
@Autowired
private KylinOrderRefundsServiceImpl kylinOrderRefundsServiceImpl;
@GetMapping("{orderRefundId}")
@ApiOperation("详情")
@ApiImplicitParam(type = "path", dataType = "String", name = "orderRefundId", value = "主键id", required = true)
public ResponseDto<KylinOrderRefundsVo> detail(@PathVariable("orderRefundId") String orderRefundId) {
KylinOrderRefundsVo result = null;
result = kylinOrderRefundsServiceImpl.detail(orderRefundId);
if (null != result) {
return ResponseDto.success(result);
} else {
return ResponseDto.failure("获取详情失败");
}
}
@GetMapping("list")
@ApiOperation("列表")
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页码"),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "每页数量")
})
public ResponseDto<PageInfo<OrderRefundDao>> bannerList(
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size
) {
PageInfo<OrderRefundDao> result = null;
result = kylinOrderRefundsServiceImpl.refundList(page, size);
if (null != result) {
return ResponseDto.success(result);
} else {
return ResponseDto.failure("获取列表失败");
}
}
@PostMapping("apply")
@ApiOperation("申请退款")
@ApiImplicitParams({
......@@ -159,7 +196,7 @@ public class KylinOrderRefundAdminController {
}
}
// @PostMapping("refundCompleted")
// @PostMapping("refundCompleted")
// @ApiOperation("主动关闭订单,完成退款")
@ApiImplicitParams({
@ApiImplicitParam(type = "body", dataType = "Integer", name = "orderRefundsId", value = "退款id", required = true)
......
package com.liquidnet.service.kylin.controller.admin;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
import com.liquidnet.service.kylin.dto.vo.KylinPagerVo;
import com.liquidnet.service.kylin.service.impl.admin.KylinRefundPerformancesAdminServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
/**
* <p>
......@@ -32,6 +33,55 @@ public class KylinOrderRefundBatchAdminController {
@Autowired
private KylinRefundPerformancesAdminServiceImpl kylinRefundPerformancesAdminServiceImpl;
/*@GetMapping("{bannersId}")
@ApiOperation("banner详情")
@ApiImplicitParam(type = "path", dataType = "String", name = "bannersId", value = "banner主键id", required = true)
public ResponseDto<KylinBannersVo> detail(@PathVariable("bannersId") String bannersId) {
KylinBannersVo result = null;
result = kylinBannersServiceImpl.detail(bannersId);
if (null != result) {
return ResponseDto.success(result);
} else {
return ResponseDto.failure("获取banner详情失败");
}
}
@GetMapping("list")
@ApiOperation("banner列表")
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "bannersName", value = "banner标题"),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "isOnline", value = "0下线 1上线"),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "promotionType", value = "推广类型 1全国 2省份"),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页码"),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "每页数量")
})
public ResponseDto<KylinPagerVo<BannerDetailsListDao>> bannerList(
@RequestParam(defaultValue = "") String bannersName,
@RequestParam(defaultValue = "1") Integer isOnline,
@RequestParam(defaultValue = "") Integer promotionType,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size
) {
BannersSearchParam bannersSearchParam = new BannersSearchParam();
bannersSearchParam.setBannersName(bannersName);
bannersSearchParam.setIsOnline(isOnline);
bannersSearchParam.setPromotionType(promotionType);
bannersSearchParam.setPage(page);
bannersSearchParam.setSize(size);
List<BannerDetailsListDao> result = kylinBannersServiceImpl.bannerList(bannersSearchParam);
Long total = kylinBannersServiceImpl.bannerListCount(bannersSearchParam);
KylinPagerVo<BannerDetailsListDao> kylinPagerVo = new KylinPagerVo();
kylinPagerVo.setRows(result);
kylinPagerVo.setTotal(total);
if (kylinPagerVo.getRows().size() > 0) {
return ResponseDto.success(kylinPagerVo);
} else {
return ResponseDto.failure("获取列表失败");
}
}*/
@PostMapping("apply")
@ApiOperation("申请演出退款")
@ApiImplicitParams({
......
......@@ -3,16 +3,29 @@ package com.liquidnet.service.kylin.service.impl.admin;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fasterxml.jackson.databind.JsonNode;
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.BannerDetailsListDao;
import com.liquidnet.service.kylin.dao.OrderRefundDao;
import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundsVo;
import com.liquidnet.service.kylin.entity.KylinBanners;
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 org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -174,4 +187,27 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
public Boolean refundCompleted(Integer orderRefundsId) {
return false;
}
public KylinOrderRefundsVo detail(String orderRefundId) {
KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(
new UpdateWrapper<KylinOrderRefunds>()
.eq("order_refunds_id", orderRefundId)
);
KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
BeanUtils.copyProperties(data, kylinOrderRefundsVo);
return kylinOrderRefundsVo;
}
public PageInfo<OrderRefundDao> refundList(Integer page, Integer size) {
PageInfo<OrderRefundDao> pageInfoTmp = null;
try {
PageHelper.startPage(page, size);
List<OrderRefundDao> voList = kylinOrderRefundsMapper.misRefundList();
pageInfoTmp = new PageInfo(voList);
} catch (Exception e) {
return null;
}
return pageInfoTmp;
}
}
package com.liquidnet.service.kylin.service.impl.admin;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.mapper.KylinOrderRefundsMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import com.liquidnet.service.kylin.mapper.KylinRefundBatchesMapper;
import com.liquidnet.service.kylin.service.IKylinRefundBatchesService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
......
package com.liquidnet.service.kylin.service.impl.admin;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.databind.JsonNode;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import com.liquidnet.service.kylin.entity.KylinRefundBatches;
import com.liquidnet.service.kylin.mapper.KylinRefundBatchesMapper;
import com.liquidnet.service.kylin.service.IKylinRefundBatchesService;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
......
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