diff --git a/src/main/java/com/sczx/order/dto/OrderDTO.java b/src/main/java/com/sczx/order/dto/OrderDTO.java index 4f55fe4..72a00e4 100644 --- a/src/main/java/com/sczx/order/dto/OrderDTO.java +++ b/src/main/java/com/sczx/order/dto/OrderDTO.java @@ -3,6 +3,7 @@ package com.sczx.order.dto; import com.fasterxml.jackson.annotation.JsonFormat; import com.sczx.order.thirdpart.dto.CarModelSimpleDTO; import com.sczx.order.thirdpart.dto.CompanyStoreDTO; +import com.sczx.order.thirdpart.dto.RentBatteyRuleDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -118,6 +119,9 @@ public class OrderDTO { @ApiModelProperty("租电套餐id") private Long rentBatteyRuleId; + @ApiModelProperty("租电套餐信息") + private RentBatteyRuleDTO rentBatteyRule; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("创建时间") private LocalDateTime createTime; diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index 8733dff..d07b5dd 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -172,6 +172,11 @@ public class OrderServiceImpl implements OrderService { CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(orderMainPO.getStoreId().toString())); CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(orderMainPO.getCarModelId()); + RentBatteyRuleDTO rentBatteyRuleDTO = null; + if(orderMainPO.getRentBatteyRuleId()!=null){ + rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(orderMainPO.getRentBatteyRuleId()); + orderDTO.setRentBatteyRule(rentBatteyRuleDTO); + } orderDTO.setCarModelSimpleDTO(carModelSimpleDTO); orderDTO.setCompanyStoreDTO(companyStoreDTO); LambdaQueryWrapper orderSubLambdaQueryWrapper = new LambdaQueryWrapper<>();