From 318a8d82a0625ef458c9c113ef5df8b0b8cf12f1 Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Sun, 3 Aug 2025 22:47:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8D=A2=E7=82=B9=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E4=BB=A5=E5=8F=8A=E7=BB=AD=E7=A7=9F=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sczx/order/convert/OrderConvert.java | 2 ++ src/main/java/com/sczx/order/dto/OrderDetailDTO.java | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sczx/order/convert/OrderConvert.java b/src/main/java/com/sczx/order/convert/OrderConvert.java index e5bb60f..eed7bcb 100644 --- a/src/main/java/com/sczx/order/convert/OrderConvert.java +++ b/src/main/java/com/sczx/order/convert/OrderConvert.java @@ -62,6 +62,8 @@ public interface OrderConvert { @Mapping(source = "orderMainPO.endRentTime", target = "endRentTime"), @Mapping(source = "orderMainPO.reqEndRentTime", target = "reqEndRentTime"), @Mapping(source = "orderMainPO.actEndRentTime", target = "actEndRentTime"), + @Mapping(source = "orderMainPO.renewalTimes", target = "renewalTimes"), + @Mapping(source = "orderMainPO.chargeTimes", target = "chargeTimes"), @Mapping(source = "companyStoreDTO.name", target = "storeName"), @Mapping(source = "companyStoreDTO.detailedAddress", target = "detailedAddress"), @Mapping(source = "carModelSimpleDTO.image", target = "image"), diff --git a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java index c705b75..4204699 100644 --- a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java +++ b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java @@ -76,7 +76,7 @@ public class OrderDetailDTO { private LocalDateTime startRentTime; @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiModelProperty("还车时间") + @ApiModelProperty("预计还车时间") private LocalDateTime endRentTime; @ApiModelProperty("申请还车时间") @@ -108,10 +108,9 @@ public class OrderDetailDTO { @ApiModelProperty("逾期金额") private Integer overdueAmount; - - @ApiModelProperty("换电次数") - private Integer changeBatteyTimes; - @ApiModelProperty("续租次数") - private Integer reRentTimes; + private Integer renewalTimes; + + @ApiModelProperty("充电次数") + private Integer chargeTimes; }