增加换点次数以及续租次数

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"),

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;
 }