p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 

# Conflicts:
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderRespDTO.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundRespDTO.java
This commit is contained in:
YunaiV 2024-10-13 17:11:18 +08:00
parent 1b925cf221 7fbdf24bca
commit d08cc2f533
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderRespDTO.java
View File

@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.pay.api.order.dto;
import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum; import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime;
/** /**
* 支付单信息 Response DTO * 支付单信息 Response DTO
* *
@ -40,10 +42,12 @@ public class PayOrderRespDTO {
* 枚举 {@link PayOrderStatusEnum} * 枚举 {@link PayOrderStatusEnum}
*/ */
private Integer status; private Integer status;
/** /**
* 订单支付成功时间 * 订单支付成功时间
*/ */
private LocalDateTime successTime; private LocalDateTime successTime;
// ========== 渠道相关字段 ========== // ========== 渠道相关字段 ==========
} }

2
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundRespDTO.java
View File

@ -17,12 +17,14 @@ public class PayRefundRespDTO {
* 退款单编号 * 退款单编号
*/ */
private Long id; private Long id;
/** /**
* 渠道编码 * 渠道编码
* *
* 枚举 PayChannelEnum * 枚举 PayChannelEnum
*/ */
private String channelCode; private String channelCode;
// ========== 退款相关字段 ========== // ========== 退款相关字段 ==========
/** /**
* 退款状态 * 退款状态