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

Skip to content

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

refund detail list delRefunds

parent d1d5d61f
Show whitespace changes
Inline Side-by-side
Showing with 750 additions and 690 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderRefundBatchesVo.java 0 → 100644
View file @ ede91591
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;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderRefundsVo.java 0 → 100644
View file @ ede91591
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;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinRefundBatchesService.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderRefundBatchesService.java
View file @ ede91591
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> {
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinRefundsService.java deleted 100644 → 0
View file @ d1d5d61f
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> {
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java 0 → 100644
View file @ ede91591
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;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinRefundBatches.java → liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderRefundBatches.java
View file @ ede91591
......@@ -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;
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinRefunds.java deleted 100644 → 0
View file @ d1d5d61f
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;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinRefundBatchesMapper.java → liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderRefundBatchesMapper.java
View file @ ede91591
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> {
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderRefundsMapper.java
View file @ ede91591
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();
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinRefundsMapper.java deleted 100644 → 0
View file @ d1d5d61f
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);
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinRefundBatchesMapper.xml → liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundBatchesMapper.xml
View file @ ede91591
<?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>
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml
View file @ ede91591
......@@ -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>
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinRefundsMapper.xml deleted 100644 → 0
View file @ d1d5d61f
<?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>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @ ede91591
create database if not exists ln_scene character set utf8mb4 collate utf8mb4_unicode_ci;
create
database if not exists ln_scene character set utf8mb4 collate utf8mb4_unicode_ci;
-- >>------------------------------------------------------------------------------------
use ln_scene;
use
ln_scene;
SET NAMES utf8mb4;
-- 轮播图
......@@ -512,26 +514,66 @@ CREATE TABLE `kylin_order_ticket_entities`
DEFAULT CHARSET = utf8mb4 COMMENT '订单详情';
# -- 订单退款 <初步>
# drop TABLE if exists `kylin_order_tickets_refund`;
# CREATE TABLE `kylin_order_tickets_refund`
# (
# `mid` int(10) unsigned NOT NULL AUTO_INCREMENT,
# `order_tickets_refund_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_tickets_refund_id',
# `order_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单id',
# `reason` varchar(255) NOT NULL DEFAULT '' COMMENT '退款原因',
# `refund_type` varchar(10) NOT NULL DEFAULT '' COMMENT '退款类型 票ticket,快递express',
# `order_ticket_entities_id` varchar(255) NOT NULL DEFAULT '' COMMENT '入场人id',
# `refund_status` tinyint NOT NULL DEFAULT 0 COMMENT '1完成退款,2关闭或者取消退款,3正在退款,4已退款',
# `refund_price` decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '退款金额',
# `coupon_type` varchar(10) NOT NULL DEFAULT '' COMMENT '优惠券类型',
# `coupon_id` varchar(255) NOT NULL DEFAULT '' COMMENT '优惠券id',
# `comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
# `created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
# `updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
# KEY `kylin_order_tickets_refund_uid_index` (`order_tickets_refund_id`),
# PRIMARY KEY (`mid`)
# ) ENGINE = InnoDB
# DEFAULT CHARSET = utf8mb4 COMMENT '订单退款';
#
drop TABLE if exists `kylin_order_tickets_refund`;
#
CREATE TABLE `kylin_order_tickets_refund`
#
(
# `mid` int
(
10
) unsigned NOT NULL AUTO_INCREMENT,
# `order_tickets_refund_id` varchar
(
255
) NOT NULL DEFAULT '' COMMENT 'order_tickets_refund_id',
# `order_id` varchar
(
255
) NOT NULL DEFAULT '' COMMENT '订单id',
# `reason` varchar
(
255
) NOT NULL DEFAULT '' COMMENT '退款原因',
# `refund_type` varchar
(
10
) NOT NULL DEFAULT '' COMMENT '退款类型 票ticket,快递express',
# `order_ticket_entities_id` varchar
(
255
) NOT NULL DEFAULT '' COMMENT '入场人id',
# `refund_status` tinyint NOT NULL DEFAULT 0 COMMENT '1完成退款,2关闭或者取消退款,3正在退款,4已退款',
# `refund_price` decimal
(
8,
2
) NOT NULL DEFAULT '0.00' COMMENT '退款金额',
# `coupon_type` varchar
(
10
) NOT NULL DEFAULT '' COMMENT '优惠券类型',
# `coupon_id` varchar
(
255
) NOT NULL DEFAULT '' COMMENT '优惠券id',
# `comment` varchar
(
255
) NOT NULL DEFAULT '' COMMENT 'comment',
# `created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
# `updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
# KEY `kylin_order_tickets_refund_uid_index`
(
`order_tickets_refund_id`
),
# PRIMARY KEY
(
`mid`
)
# ) ENGINE = InnoDB
# DEFAULT CHARSET = utf8mb4 COMMENT '订单退款';
-- 购票须知表
drop TABLE if exists `kylin_buy_notice`;
......@@ -589,7 +631,8 @@ CREATE TABLE `kylin_check_user_performances`
-- 快递相关临时
drop TABLE if exists `express_batches`;
CREATE TABLE `express_batches` (
CREATE TABLE `express_batches`
(
`id` int unsigned NOT NULL AUTO_INCREMENT,
`admin_id` int NOT NULL DEFAULT '0' COMMENT '管理员',
`order_id` int NOT NULL DEFAULT '0' COMMENT '订单Id，订阅前查询',
......@@ -612,7 +655,8 @@ CREATE TABLE `express_batches` (
KEY `express_batches_order_type_index` (`order_type`)
) ENGINE=InnoDB AUTO_INCREMENT=34781 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
drop TABLE if exists `express_logs`;
CREATE TABLE `express_logs` (
CREATE TABLE `express_logs`
(
`id` int unsigned NOT NULL AUTO_INCREMENT,
`order_id` int NOT NULL COMMENT '订单id',
`order_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '订单类型 order_product 商品订单 , order_ticket 票务订单',
......@@ -626,7 +670,8 @@ CREATE TABLE `express_logs` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=487 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
drop TABLE if exists `express_timelines`;
CREATE TABLE `express_timelines` (
CREATE TABLE `express_timelines`
(
`id` int unsigned NOT NULL AUTO_INCREMENT,
`express_id` int NOT NULL DEFAULT '0' COMMENT '快递',
`context` varchar(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '快递消息',
......@@ -637,7 +682,8 @@ CREATE TABLE `express_timelines` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=2039805 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='快递时间线表';
drop TABLE if exists `expresses`;
CREATE TABLE `expresses` (
CREATE TABLE `expresses`
(
`id` int unsigned NOT NULL AUTO_INCREMENT,
`admin_id` int NOT NULL DEFAULT '0' COMMENT '管理员',
`order_id` int NOT NULL DEFAULT '0' COMMENT '订单Id',
......@@ -713,129 +759,61 @@ values ('12', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/
'电子票购票人须持本人身份证原件和订单二维码验票入场。请不要将身份证信息和订单二维码提供给他人，因此导致的损失，主办方/平台方不承担任何责任。', '1', '0', '2019-01-29 13:51:42',
'2019-01-29 13:51:42', '凭身份证原件兑票');
# 批量退款表
drop TABLE if exists `kylin_refund_batches`;
CREATE TABLE `kylin_refund_batches`
#批量退款表
drop TABLE if exists `kylin_order_refund_batches`;
CREATE TABLE `kylin_order_refund_batches`
(
`mid` int unsigned NOT NULL AUTO_INCREMENT,
`refund_batch_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'refund_batch_id',
`target_id` varchar(255) NOT NULL DEFAULT '' COMMENT '目标id target_type=1为演出id',
`target_title` varchar(255) NOT NULL DEFAULT '' COMMENT '目标名称 target_type=1为演出名称',
`target_type` tinyint NOT NULL DEFAULT '1' COMMENT '目标类型 1演出',
`status` tinyint NOT NULL DEFAULT '1' COMMENT '批量退款状态 1申请退款 2取消退款 3运营驳回审核 4运营通过审核 5财务驳回审核 6财务通过审核',
`total_price` decimal(11, 2) NOT NULL DEFAULT '0.00' COMMENT '批量退款总金额',
`real_total_price` decimal(11, 2) NOT NULL DEFAULT '0.00' COMMENT '实际批量退款总金额',
`total_num` int NOT NULL DEFAULT '0' COMMENT '批量退款总数量',
`real_total_num` int NOT NULL DEFAULT '0' COMMENT '实际批量退款总数量',
`total_refund_alipay` decimal(11, 2) NOT NULL DEFAULT '0.00' COMMENT '申请时支付宝需退款总金额',
`total_refund_wepay` decimal(11, 2) NOT NULL DEFAULT '0.00' COMMENT '申请时微信需退款总金额',
`total_price_express_alipay` decimal(11, 2) NOT NULL DEFAULT '0.00' COMMENT '快递费总金额支付宝',
`total_price_express_wepay` decimal(11, 2) NOT NULL DEFAULT '0.00' COMMENT '快递费总金额微信',
`reason` varchar(200) NOT NULL DEFAULT '' COMMENT '批量退款原因',
`remark` varchar(200) NOT NULL DEFAULT '' COMMENT '批量退款备注',
`reject` varchar(200) NOT NULL DEFAULT '' COMMENT '驳回原因',
`refuse` varchar(200) NOT NULL DEFAULT '' COMMENT '回绝原因',
`applicant_id` varchar(255) NOT NULL DEFAULT '' COMMENT '批量申请人id',
`applicant_name` varchar(100) NOT NULL DEFAULT '' COMMENT '批量申请人名称',
`applicant_at` timestamp NULL DEFAULT NULL COMMENT '批量申请时间',
`auditor_id` varchar(255) NOT NULL DEFAULT '' COMMENT '批量审核人id',
`auditor_name` varchar(100) NOT NULL DEFAULT '' COMMENT '批量审核人名称',
`auditor_at` timestamp NULL DEFAULT NULL COMMENT '批量审核时间',
`executor_id` varchar(255) NOT NULL DEFAULT '' COMMENT '批量执行人id',
`executor_name` varchar(100) NOT NULL DEFAULT '' COMMENT '批量执行人名称',
`executor_at` timestamp NULL DEFAULT NULL COMMENT '批量执行时间',
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
KEY `kylin_refund_batch_id_index` (`refund_batch_id`),
KEY `kylin_order_refund_batch_id_index` (`refund_batch_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_unicode_ci COMMENT '批量退款表';
# 退款表
drop TABLE if exists `kylin_refunds`;
CREATE TABLE `kylin_refunds`
#订单退款表
drop TABLE if exists `kylin_order_refunds`;
CREATE TABLE `kylin_order_refunds`
(
`mid` int unsigned NOT NULL AUTO_INCREMENT,
`refunds_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'refunds_id',
`merchant_id` varchar(255) NOT NULL DEFAULT '' COMMENT '商户id',
`status` tinyint NOT NULL DEFAULT '0' COMMENT '退款状态: 0请求退款 2取消退款 1审核通过 5驳回退款 7等待退款 3正在退款 4完成退款 6退款失败',
`type` tinyint NOT NULL DEFAULT '0' COMMENT '退款差异: 0申请退款返还库存 1自动退款无法取消退款不返还库存',
`order_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单id',
`order_type` varchar(50) NOT NULL DEFAULT '' COMMENT '订单类型 order_product 商品订单 , order_ticket 票务订单',
`order_code` varchar(50) NOT NULL COMMENT '订单中心订单号，这里方便查询',
`order_title` varchar(200) NOT NULL DEFAULT '' COMMENT '退款内容，演出title，商品title，这里方便查询',
`order_mobile` varchar(20) NOT NULL DEFAULT '' COMMENT '退款手机号，这里方便查询',
`pay_code` varchar(50) NOT NULL COMMENT '支付中心支付单号，用于申请退款',
`order_refunds_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_refunds_id',
`order_tickets_id` varchar(255) NOT NULL DEFAULT '' COMMENT '票务订单id',
`order_refund_code` varchar(50) NOT NULL COMMENT '退款编号',
`price` decimal(10, 2) NOT NULL DEFAULT '0.00' COMMENT '退款总金额',
`reason` varchar(200) NOT NULL DEFAULT '' COMMENT '退款原因',
`remark` varchar(200) NOT NULL DEFAULT '' COMMENT '退款备注',
`reject` varchar(200) NOT NULL DEFAULT '' COMMENT '驳回原因',
`refuse` varchar(200) NOT NULL DEFAULT '' COMMENT '回绝原因',
`refund_code` varchar(50) DEFAULT NULL COMMENT '退款中心退款编号',
`refund_type` varchar(20) DEFAULT NULL COMMENT '退款类型',
`order_refund_batches_id` varchar(255) NOT NULL DEFAULT '' COMMENT '批量退款id',
`refund_code` varchar(50) NOT NULL DEFAULT '' COMMENT '退款中心退款编号',
`refund_at` timestamp NULL DEFAULT NULL COMMENT '成功退款时间',
`refund_id` varchar(50) DEFAULT NULL COMMENT '第三方退款编号',
`refund_error` varchar(100) DEFAULT NULL COMMENT '退款失败原因',
`refund_id` varchar(50) NOT NULL DEFAULT '' COMMENT '第三方退款编号',
`refund_error` varchar(100) NOT NULL DEFAULT '' COMMENT '退款失败原因',
`price` decimal(10, 2) NOT NULL DEFAULT '0.00' COMMENT '退款总金额',
`status` tinyint NOT NULL DEFAULT '0' COMMENT '退款状态: 0请求退款 2取消退款 1审核通过 5驳回退款 7等待退款 3正在退款 4完成退款 6退款失败',
`type` tinyint NOT NULL DEFAULT '0' COMMENT '退款差异: 0申请退款返还库存 1自动退款无法取消退款不返还库存',
`applicant_id` varchar(255) NOT NULL DEFAULT '' COMMENT '申请人id',
`applicant_name` varchar(100) NOT NULL DEFAULT '' COMMENT '申请人名称',
`applicant_at` timestamp NULL DEFAULT NULL COMMENT '申请时间',
`reason` varchar(200) NOT NULL DEFAULT '' COMMENT '退款原因',
`auditor_id` varchar(255) NOT NULL DEFAULT '' COMMENT '审核人id',
`auditor_name` varchar(100) NOT NULL DEFAULT '' COMMENT '审核人名称',
`auditor_at` timestamp NULL DEFAULT NULL COMMENT '审核时间',
`reject` varchar(200) NOT NULL DEFAULT '' COMMENT '驳回原因',
`executor_id` varchar(255) NOT NULL DEFAULT '' COMMENT '执行人id',
`executor_name` varchar(100) NOT NULL DEFAULT '' COMMENT '执行人名称',
`executor_at` timestamp NULL DEFAULT NULL COMMENT '执行时间',
`batch_id` varchar(255) NOT NULL DEFAULT '' COMMENT '批量退款id',
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
`payment_type` varchar(20) NOT NULL DEFAULT '' COMMENT '支付类型',
PRIMARY KEY (`mid`),
UNIQUE KEY `kylin_refunds_order_refund_code_unique` (`order_refund_code`),
KEY `kylin_refunds_id_index` (`refunds_id`),
KEY `kylin_refunds_order_id_index` (`order_id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_unicode_ci COMMENT ='退款表';
# 订单退款表
drop TABLE if exists `kylin_order_refunds`;
CREATE TABLE `kylin_order_refunds`
(
`mid` int unsigned NOT NULL AUTO_INCREMENT,
`order_refunds_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_refunds_id',
`performance_id` varchar(255) NOT NULL DEFAULT '' COMMENT '演出 id',
`merchant_id` varchar(255) NOT NULL DEFAULT '' COMMENT '商户id',
`order_id` varchar(255) NOT NULL DEFAULT '' COMMENT '票务订单id',
`matter_id` varchar(255) NOT NULL DEFAULT '' COMMENT '商品订单id',
`admin_id` varchar(255) NOT NULL DEFAULT '' COMMENT '管理员id',
`admin_name` varchar(100) NOT NULL DEFAULT '' COMMENT '管理员名称',
`reason` varchar(200) NOT NULL DEFAULT '' COMMENT '退款原因',
`batch` int NOT NULL DEFAULT '1' COMMENT '批次从1开始',
`order_type` varchar(50) NOT NULL DEFAULT '' COMMENT '下单方式',
`pay_type` enum ('wepay','alipay','no') NOT NULL DEFAULT 'no' COMMENT '选择支付方式',
`payment_type` varchar(50) NOT NULL DEFAULT '' COMMENT '实际支付方式',
`refund_table` enum ('order_ticket_entities','matter_items') NOT NULL DEFAULT 'order_ticket_entities' COMMENT '订单入场人/搭售款式表',
`refund_type` enum ('ticket','product','express') NOT NULL DEFAULT 'ticket' COMMENT '票务/商品/快递费',
`refund_table_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单入场人/搭售款式表 id',
`refund_type_parent_id` varchar(255) NOT NULL DEFAULT '' COMMENT '演出/商品 id',
`refund_type_id` varchar(255) NOT NULL DEFAULT '' COMMENT '票种/款式 id',
`refund_status` int unsigned NOT NULL DEFAULT '0' COMMENT '2关闭或者取消退款3正在退款,4已退款',
`refund_number` int NOT NULL DEFAULT '0' COMMENT '数量',
`refund_price` decimal(10, 2) NOT NULL DEFAULT '0.00' COMMENT '退款金额 快递费有可能为负,意思是补差价',
`coupon_type` enum ('exchange','voucher','no') NOT NULL DEFAULT 'no' COMMENT '使用了兑换券/优惠券/无使用',
`coupon_id` varchar(255) NOT NULL DEFAULT '' COMMENT '优惠券id',
`refuse` varchar(200) NOT NULL DEFAULT '' COMMENT '回绝原因',
`refund_type` enum('ticket','express','all') NOT NULL DEFAULT 'ticket' COMMENT '票务/快递费/票和快递费',
`order_ticket_entities_ids` text COMMENT '订单入场人/搭售款式表 id 多个 ,分割',
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
`refund_remark` varchar(200) NOT NULL DEFAULT '' COMMENT '退款备注',
`refund_code` varchar(100) NOT NULL DEFAULT '' COMMENT '退款单号',
`refund_id` varchar(255) NOT NULL DEFAULT '' COMMENT '退款表refunds的id',
PRIMARY KEY (`mid`),
KEY `kylin_order_refunds_order_id_index` (`order_id`),
UNIQUE KEY `kylin_order_refunds_order_refund_code_unique` (`order_refund_code`),
KEY `kylin_order_refunds_order_tickets_id_index` (`order_tickets_id`),
KEY `kylin_order_refunds_refund_type_index` (`refund_type`),
KEY `kylin_order_refunds_refund_status_index` (`refund_status`),
KEY `kylin_order_refunds_id_index` (`order_refunds_id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_unicode_ci COMMENT ='订单退款表';
\ No newline at end of file
KEY `kylin_order_refunds_order_refunds_id_index` (`order_refunds_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='订单退款表'
\ No newline at end of file
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinOrderRefundAdminController.java
View file @ ede91591
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)
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinOrderRefundBatchAdminController.java
View file @ ede91591
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({
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinOrderRefundsServiceImpl.java
View file @ ede91591
......@@ -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;
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinRefundExecuteServiceImpl.java
View file @ ede91591
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;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinRefundHttpSubmitServiceImpl.java
View file @ ede91591
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;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinRefundPerformancesAdminServiceImpl.java
View file @ ede91591
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.commons.lang.util.IDGenerator;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
import com.liquidnet.service.kylin.entity.KylinRefundBatches;
import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import com.liquidnet.service.kylin.mapper.KylinRefundBatchesMapper;
import com.liquidnet.service.kylin.service.IKylinRefundBatchesService;
import com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -35,7 +33,7 @@ public class KylinRefundPerformancesAdminServiceImpl {
private KylinOrderTicketsMapper kylinOrderTicketsMapper;
@Autowired
private KylinRefundBatchesMapper kylinRefundBatchesMapper;
private KylinOrderRefundBatchesMapper kylinOrderRefundBatchesMapper;
@Autowired
private KylinRefundExecuteServiceImpl kylinRefundExecuteServiceImpl;
......@@ -57,8 +55,8 @@ public class KylinRefundPerformancesAdminServiceImpl {
double totalPriceExpressAlipay = kylinOrderTicketsMapper.getTotalPrice(targetId, "price_express", paymentTypeAlipayArray);
double totalPriceExpressWepay = kylinOrderTicketsMapper.getTotalPrice(targetId, "price_express", paymentTypeWepayArray);
KylinRefundBatches refundBatchesInfo = kylinRefundBatchesMapper.selectOne(
new UpdateWrapper<KylinRefundBatches>().eq("target_id", targetId).eq("target_type", targetType).orderByDesc("refund_batch_id")
KylinOrderRefundBatches refundBatchesInfo = kylinOrderRefundBatchesMapper.selectOne(
new UpdateWrapper<KylinOrderRefundBatches>().eq("target_id", targetId).eq("target_type", targetType).orderByDesc("refund_batch_id")
);
if (refundBatchesInfo.getRefundBatchId().isEmpty() || refundBatchesInfo.getStatus() == KylinTableStatusConst.STATUS_CANCEL || refundBatchesInfo.getStatus() == KylinTableStatusConst.STATUS_FINANCE_ADOPT) {
......@@ -66,7 +64,7 @@ public class KylinRefundPerformancesAdminServiceImpl {
KylinPerformanceVo performancesInfo = (KylinPerformanceVo) redisUtil.hget(KylinRedisConst.PERFORMANCES, targetId);
String refundBatchId = IDGenerator.nextSnowId().toString();
KylinRefundBatches createData = new KylinRefundBatches();
KylinOrderRefundBatches createData = new KylinOrderRefundBatches();
createData.setRefundBatchId(refundBatchId);
createData.setTargetTitle(performancesInfo.getTitle());
createData.setTotalPrice(BigDecimal.valueOf(totalPrice));
......@@ -80,7 +78,7 @@ public class KylinRefundPerformancesAdminServiceImpl {
createData.setStatus(KylinTableStatusConst.STATUS_APPLY);
createData.setApplicantAt(LocalDateTime.now());
int resNum = kylinRefundBatchesMapper.insert(createData);
int resNum = kylinOrderRefundBatchesMapper.insert(createData);
if (resNum > 0) {
// 开始执行批量提交审核 分批处理退款申请
kylinRefundExecuteServiceImpl.refundBatchApply(targetId, refundBatchId, OtherParam);
......@@ -95,18 +93,18 @@ public class KylinRefundPerformancesAdminServiceImpl {
public Boolean refundBatchReapply(String refundBatchId, String remark, HashMap<String, Object> otherParam) throws Exception {
Integer[] paymentTypeAlipayArray = {KylinTableStatusConst.STATUS_OPERATE_REJECT, KylinTableStatusConst.STATUS_FINANCE_REJECT};
KylinRefundBatches refundBatchesInfo = kylinRefundBatchesMapper.selectOne(
new UpdateWrapper<KylinRefundBatches>().eq("refund_batch_id", refundBatchId).in("status", paymentTypeAlipayArray)
KylinOrderRefundBatches refundBatchesInfo = kylinOrderRefundBatchesMapper.selectOne(
new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId).in("status", paymentTypeAlipayArray)
);
if (!refundBatchesInfo.getRefundBatchId().isEmpty()) {
// 开始执行批量提交审核 分批处理退款申请
kylinRefundExecuteServiceImpl.refundBatchStatus(refundBatchId, otherParam);
KylinRefundBatches params = new KylinRefundBatches();
KylinOrderRefundBatches params = new KylinOrderRefundBatches();
params.setStatus(KylinTableStatusConst.STATUS_APPLY);
params.setRemark(remark);
kylinRefundBatchesMapper.update(params, new UpdateWrapper<KylinRefundBatches>().eq("refund_batch_id", refundBatchId));
kylinOrderRefundBatchesMapper.update(params, new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId));
return true;
} else {
......@@ -116,17 +114,17 @@ public class KylinRefundPerformancesAdminServiceImpl {
public Boolean refundBatchCancel(String refundBatchId, HashMap<String, Object> otherParam) throws Exception {
Integer[] paymentTypeAlipayArray = {KylinTableStatusConst.STATUS_APPLY, KylinTableStatusConst.STATUS_OPERATE_REJECT, KylinTableStatusConst.STATUS_OPERATE_ADOPT, KylinTableStatusConst.STATUS_FINANCE_REJECT};
KylinRefundBatches refundBatchesInfo = kylinRefundBatchesMapper.selectOne(
new UpdateWrapper<KylinRefundBatches>().eq("refund_batch_id", refundBatchId).in("status", paymentTypeAlipayArray)
KylinOrderRefundBatches refundBatchesInfo = kylinOrderRefundBatchesMapper.selectOne(
new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId).in("status", paymentTypeAlipayArray)
);
if (!refundBatchesInfo.getRefundBatchId().isEmpty()) {
// 开始执行批量提交审核 分批处理退款申请
kylinRefundExecuteServiceImpl.refundBatchStatus(refundBatchId, otherParam);
KylinRefundBatches params = new KylinRefundBatches();
KylinOrderRefundBatches params = new KylinOrderRefundBatches();
params.setStatus(KylinTableStatusConst.STATUS_CANCEL);
kylinRefundBatchesMapper.update(params, new UpdateWrapper<KylinRefundBatches>().eq("refund_batch_id", refundBatchId));
kylinOrderRefundBatchesMapper.update(params, new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId));
return true;
} else {
......@@ -143,8 +141,8 @@ public class KylinRefundPerformancesAdminServiceImpl {
updateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED;
}
Integer[] paymentTypeAlipayArray = {KylinTableStatusConst.STATUS_APPLY};
KylinRefundBatches refundBatchesInfo = kylinRefundBatchesMapper.selectOne(
new UpdateWrapper<KylinRefundBatches>().eq("refund_batch_id", refundBatchId).in("status", paymentTypeAlipayArray)
KylinOrderRefundBatches refundBatchesInfo = kylinOrderRefundBatchesMapper.selectOne(
new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId).in("status", paymentTypeAlipayArray)
);
if (!refundBatchesInfo.getRefundBatchId().isEmpty()) {
......@@ -152,13 +150,13 @@ public class KylinRefundPerformancesAdminServiceImpl {
otherParam.put("status", updateStatus);
kylinRefundExecuteServiceImpl.refundBatchStatus(refundBatchId, otherParam);
KylinRefundBatches params = new KylinRefundBatches();
KylinOrderRefundBatches params = new KylinOrderRefundBatches();
params.setStatus(batchStatus);
params.setReject((String) otherParam.get("reject"));
params.setAuditorId(2);
params.setAuditorName("2222");
params.setAuditorAt(LocalDateTime.now());
kylinRefundBatchesMapper.update(params, new UpdateWrapper<KylinRefundBatches>().eq("refund_batch_id", refundBatchId));
kylinOrderRefundBatchesMapper.update(params, new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId));
return true;
} else {
......@@ -175,8 +173,8 @@ public class KylinRefundPerformancesAdminServiceImpl {
updateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_UNFILLED;
}
Integer[] paymentTypeAlipayArray = {KylinTableStatusConst.STATUS_APPLY};
KylinRefundBatches refundBatchesInfo = kylinRefundBatchesMapper.selectOne(
new UpdateWrapper<KylinRefundBatches>().eq("refund_batch_id", refundBatchId).in("status", paymentTypeAlipayArray)
KylinOrderRefundBatches refundBatchesInfo = kylinOrderRefundBatchesMapper.selectOne(
new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId).in("status", paymentTypeAlipayArray)
);
if (!refundBatchesInfo.getRefundBatchId().isEmpty()) {
......@@ -184,13 +182,13 @@ public class KylinRefundPerformancesAdminServiceImpl {
otherParam.put("status", updateStatus);
kylinRefundExecuteServiceImpl.refundBatchStatus(refundBatchId, otherParam);
KylinRefundBatches params = new KylinRefundBatches();
KylinOrderRefundBatches params = new KylinOrderRefundBatches();
params.setStatus(batchStatus);
params.setRefuse((String) otherParam.get("refuse"));
params.setExecutorId(2);
params.setExecutorName("2222");
params.setExecutorAt(LocalDateTime.now());
kylinRefundBatchesMapper.update(params, new UpdateWrapper<KylinRefundBatches>().eq("refund_batch_id", refundBatchId));
kylinOrderRefundBatchesMapper.update(params, new UpdateWrapper<KylinOrderRefundBatches>().eq("refund_batch_id", refundBatchId));
return true;
} else {
......
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