From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java
index 4f762b6..d7ae845 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java
@@ -40,6 +40,7 @@
@TableField("refund_code")
private String refundCode;
+
@ApiModelProperty(value = "退款金额")
@TableField("refund_amount")
private BigDecimal refundAmount;
@@ -58,7 +59,7 @@
@ApiModelProperty(value = "退款成功时间")
@TableField("refund_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime refundTime;
@ApiModelProperty(value = "订单编号")
@@ -88,6 +89,10 @@
@ApiModelProperty(value = "累计退款金额")
@TableField("pay_amount")
private BigDecimal payAmount;
+
+ @ApiModelProperty(value = "手续费")
+ @TableField("refund_fee")
+ private BigDecimal refundFee;
@TableField(exist = false)
private Integer type;
@@ -99,11 +104,13 @@
private BigDecimal paymentAmount;
@ApiModelProperty(value = "支付时间")
@TableField(exist = false)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime payTime;
@ApiModelProperty(value = "订单id")
@TableField(exist = false)
private String orderId;
@TableField(exist = false)
private String userId;
+ @TableField(exist = false)
+ private String uid;
}
--
Gitblit v1.7.1