From 2e43d137c7832e149f3df4145aa7fcca2153ef9c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 31 八月 2024 16:52:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
index 618977e..762d550 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDateTime;
+
@Data
public class PayOrderDto {
private String id;
@@ -23,7 +25,13 @@
private Double orderAmount;
@ApiModelProperty("支付金额")
private Double paymentAmount;
- private java.sql.Timestamp createTime;
- private java.sql.Timestamp endTime;
+ @ApiModelProperty("下单时间")
+ private LocalDateTime createTime;
+ @ApiModelProperty("订单完成时间")
+ private LocalDateTime endTime;
+ @ApiModelProperty("支付时间")
+ private LocalDateTime payTime;
+ private Integer refundStatus;
+ private Double finalAmount;
}
--
Gitblit v1.7.1