From 9ea18e97ce0a2318619a608a5a4585e7378553ea Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 06 三月 2025 15:28:41 +0800
Subject: [PATCH] 修改bug和漏洞修复
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java | 21 +++++++++++++++++++--
1 files changed, 19 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..cfc9ff3 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
@@ -1,13 +1,20 @@
package com.ruoyi.order.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDateTime;
+
@Data
+@ApiModel("支付订单返回Dto")
public class PayOrderDto {
private String id;
@ApiModelProperty("1充电订单2购物订单3vip订单4停车订单")
private Integer type;
+ @ApiModelProperty("站点id")
+ private Integer siteId;
@ApiModelProperty("订单编号")
private String code;
@ApiModelProperty("订单标题")
@@ -21,9 +28,19 @@
private Integer status;
@ApiModelProperty("订单金额")
private Double orderAmount;
+ private Double rechargeAmount;
@ApiModelProperty("支付金额")
private Double paymentAmount;
- private java.sql.Timestamp createTime;
- private java.sql.Timestamp endTime;
+ @ApiModelProperty("下单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+ @ApiModelProperty("订单完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime endTime;
+ @ApiModelProperty("支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime payTime;
+ private Integer refundStatus;
+ private Double finalAmount;
}
--
Gitblit v1.7.1