diff --git a/src/main/java/com/sczx/order/convert/OrderConvert.java b/src/main/java/com/sczx/order/convert/OrderConvert.java index 58980ff..d4a4796 100644 --- a/src/main/java/com/sczx/order/convert/OrderConvert.java +++ b/src/main/java/com/sczx/order/convert/OrderConvert.java @@ -60,7 +60,10 @@ public interface OrderConvert { @Mapping(source = "orderMainPO.firstOrderTime", target = "firstOrderTime"), @Mapping(source = "orderMainPO.startRentTime", target = "startRentTime"), @Mapping(source = "orderMainPO.endRentTime", target = "endRentTime"), + @Mapping(source = "orderMainPO.reqEndRentTime", target = "reqEndRentTime"), + @Mapping(source = "orderMainPO.actEndRentTime", target = "actEndRentTime"), @Mapping(source = "companyStoreDTO.name", target = "storeName"), + @Mapping(source = "companyStoreDTO.detailedAddress", target = "detailedAddress"), @Mapping(source = "carDTO.modelName", target = "modelName"), @Mapping(source = "carDTO.brandName", target = "brandName"), @Mapping(source = "carDTO.id", target = "carId"), diff --git a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java index 75b0b64..3be77c7 100644 --- a/src/main/java/com/sczx/order/dto/OrderDetailDTO.java +++ b/src/main/java/com/sczx/order/dto/OrderDetailDTO.java @@ -24,6 +24,9 @@ public class OrderDetailDTO { @ApiModelProperty("门店名称") private String storeName; + @ApiModelProperty("详细地址") + private String detailedAddress; + @ApiModelProperty("车型名称") private String modelName; @@ -73,6 +76,12 @@ public class OrderDetailDTO { @ApiModelProperty("还车时间") private LocalDateTime endRentTime; + @ApiModelProperty("申请还车时间") + private LocalDateTime reqEndRentTime; + + @ApiModelProperty("实际还车时间") + private LocalDateTime actEndRentTime; + @ApiModelProperty("电池订单号") private String rentBatteyOrderNo; @@ -96,4 +105,10 @@ public class OrderDetailDTO { @ApiModelProperty("逾期金额") private Integer overdueAmount; + + @ApiModelProperty("换电次数") + private Integer changeBatteyTimes; + + @ApiModelProperty("续租次数") + private Integer reRentTimes; }