From d4cd85c72b9b6ac5d37f2f280851cb1d371eae3a Mon Sep 17 00:00:00 2001 From: HH Date: Tue, 18 Apr 2023 11:06:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=80=80=E6=AC=BE=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BB=A5=E4=BE=BF=E4=BA=8E=E6=8E=92=E6=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/payment/domain/FinancialDetail.java | 12 +++++++-- .../ghy/payment/domain/FinancialMaster.java | 4 +-- .../com/ghy/payment/domain/ReverseRecord.java | 12 +++++++++ .../payment/mapper/ReverseRecordMapper.java | 20 ++++++++++++++ .../mapper/payment/ReverseRecordMapper.xml | 27 +++++++++++++++++++ 5 files changed, 71 insertions(+), 4 deletions(-) diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java index 871424f9..7b01741f 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java @@ -3,6 +3,8 @@ package com.ghy.payment.domain; import com.ghy.common.annotation.Excel; import com.ghy.common.core.domain.BaseEntity; import com.ghy.common.enums.FinancialDetailType; +import com.ghy.common.enums.PayStatus; +import com.ghy.common.enums.PayTypeEnum; import lombok.Data; import lombok.EqualsAndHashCode; @@ -72,10 +74,16 @@ public class FinancialDetail extends BaseEntity { @Excel(name = "Adapay撤销支付或退款ID", cellType = Excel.ColumnType.STRING) private String reverseId; - @Excel(name = "支付方式,微信/支付宝/线下", cellType = Excel.ColumnType.NUMERIC) + /** + * @see PayTypeEnum + */ + @Excel(name = "支付方式", cellType = Excel.ColumnType.NUMERIC) private Integer payType; - @Excel(name = "支付状态, 0未付款/1已付款/2已取消/3已退款", cellType = Excel.ColumnType.NUMERIC) + /** + * @see PayStatus + */ + @Excel(name = "支付状态", cellType = Excel.ColumnType.NUMERIC) private Integer payStatus; @Excel(name = "付款时间", cellType = Excel.ColumnType.STRING) diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java index dd4d23be..34aa858c 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java @@ -50,13 +50,13 @@ public class FinancialMaster extends BaseEntity { /** * @see PayTypeEnum */ - @Excel(name = "支付方式,微信/支付宝/线下", cellType = Excel.ColumnType.NUMERIC) + @Excel(name = "支付方式", cellType = Excel.ColumnType.NUMERIC) private Integer payType; /** * @see PayStatus */ - @Excel(name = "支付状态, 未付款/已付款", cellType = Excel.ColumnType.NUMERIC) + @Excel(name = "支付状态", cellType = Excel.ColumnType.NUMERIC) private Integer payStatus; @Excel(name = "付款时间", cellType = Excel.ColumnType.STRING) diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/ReverseRecord.java b/ghy-payment/src/main/java/com/ghy/payment/domain/ReverseRecord.java index 956ba370..ec19a2be 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/domain/ReverseRecord.java +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/ReverseRecord.java @@ -17,12 +17,24 @@ public class ReverseRecord { private String orderNo; @JSONField(name = "payment_id") private String paymentId; + /** + * 本次撤销金额 + */ @JSONField(name = "reverse_amt") private String reverseAmt; + /** + * 原支付对象已撤销金额，包括已撤销完成金额和撤销处理中的金额 + */ @JSONField(name = "reversed_amt") private String reversedAmt; + /** + * 当前支付对象已确认金额 + */ @JSONField(name = "confirmed_amt") private String confirmedAmt; + /** + * 当前支付确认对象已退款金额，包括已退款完成金额和退款处理中的金额 + */ @JSONField(name = "refunded_amt") private String refundedAmt; @JSONField(name = "error_code") diff --git a/ghy-payment/src/main/java/com/ghy/payment/mapper/ReverseRecordMapper.java b/ghy-payment/src/main/java/com/ghy/payment/mapper/ReverseRecordMapper.java index e939f21d..d1ebdf17 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/mapper/ReverseRecordMapper.java +++ b/ghy-payment/src/main/java/com/ghy/payment/mapper/ReverseRecordMapper.java @@ -2,7 +2,27 @@ package com.ghy.payment.mapper; import com.ghy.payment.domain.ReverseRecord; +/** + * 退款记录Mapper + * + * @author HH + * @date 2023/4/18 + */ public interface ReverseRecordMapper { + /** + * 全字段insert + * + * @param record 退款记录 + * @return Affected rows + */ int insert(ReverseRecord record); + + /** + * 全字段update + * + * @param record 退款记录 + * @return Affected rows + */ + int update(ReverseRecord record); } diff --git a/ghy-payment/src/main/resources/mapper/payment/ReverseRecordMapper.xml b/ghy-payment/src/main/resources/mapper/payment/ReverseRecordMapper.xml index 405a76cb..3ab6c5c0 100644 --- a/ghy-payment/src/main/resources/mapper/payment/ReverseRecordMapper.xml +++ b/ghy-payment/src/main/resources/mapper/payment/ReverseRecordMapper.xml @@ -2,6 +2,23 @@ + + + + + + + + + + + + + + + + + SELECT id, status, order_no, payment_id, reverse_amt, reversed_amt, confirmed_amt, refunded_amt, error_code, error_msg, error_type, created_time, create_time, dept_id @@ -15,4 +32,14 @@ #{refundedAmt}, #{errorCode}, #{errorMsg}, #{errorType}, #{createdTime}, #{deptId}) + + UPDATE reverse_record + SET status = #{status}, order_no = #{orderNo}, payment_id = #{paymentId}, + reverse_amt = #{reverseAmt}, reversed_amt = #{reversedAmt}, + confirmed_amt = #{confirmedAmt}, refunded_amt = #{refundedAmt}, + error_code = #{errorCode}, error_msg = #{errorMsg}, error_type = #{errorType}, + created_time = #{createdTime}, dept_id = #{deptId} + WHERE id = #{id} + + \ No newline at end of file