From 0d4c9f50ee2bc3e4a03abd91ac7c9e03891d37f2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 二月 2025 17:41:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java | 18 ++++++++++++++++--
1 files changed, 16 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 c95a809..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
@@ -5,6 +5,8 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -38,6 +40,7 @@
@TableField("refund_code")
private String refundCode;
+
@ApiModelProperty(value = "退款金额")
@TableField("refund_amount")
private BigDecimal refundAmount;
@@ -56,6 +59,7 @@
@ApiModelProperty(value = "退款成功时间")
@TableField("refund_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime refundTime;
@ApiModelProperty(value = "订单编号")
@@ -85,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;
@@ -96,7 +104,13 @@
private BigDecimal paymentAmount;
@ApiModelProperty(value = "支付时间")
@TableField(exist = false)
+ @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