diff --git a/src/main/java/com/sczx/order/dto/OrderDTO.java b/src/main/java/com/sczx/order/dto/OrderDTO.java index a71bf8f..9e03386 100644 --- a/src/main/java/com/sczx/order/dto/OrderDTO.java +++ b/src/main/java/com/sczx/order/dto/OrderDTO.java @@ -1,6 +1,7 @@ package com.sczx.order.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.sczx.order.thirdpart.dto.CarDTO; import com.sczx.order.thirdpart.dto.CarModelSimpleDTO; import com.sczx.order.thirdpart.dto.CompanyStoreDTO; import com.sczx.order.thirdpart.dto.RentBatteyRuleDTO; @@ -42,6 +43,9 @@ public class OrderDTO { @ApiModelProperty("车辆ID") private Long vehicleId; + @ApiModelProperty("车辆信息") + private CarDTO carDTO; + @ApiModelProperty("车型ID") private Long carModelId; 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 219dcea..e98cccb 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -189,15 +189,22 @@ public class OrderServiceImpl implements OrderService { OrderDTO orderDTO = OrderConvert.INSTANCE.poToDto(orderMainPO); //获取门店信息 CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(orderMainPO.getStoreId().toString())); + orderDTO.setCompanyStoreDTO(companyStoreDTO); CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(orderMainPO.getCarModelId()); + orderDTO.setCarModelSimpleDTO(carModelSimpleDTO); RentBatteyRuleDTO rentBatteyRuleDTO = null; if(orderMainPO.getRentBatteyRuleId()!=null){ rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(orderMainPO.getRentBatteyRuleId()); orderDTO.setRentBatteyRule(rentBatteyRuleDTO); } - orderDTO.setCarModelSimpleDTO(carModelSimpleDTO); - orderDTO.setCompanyStoreDTO(companyStoreDTO); + + if(orderMainPO.getVehicleId() !=null){ + CarDTO carDTO = carInteg.getCarByCarCondition(CarQueryConditionReq.builder().carId(orderMainPO.getVehicleId()).build()); + orderDTO.setCarDTO(carDTO); + } + + LambdaQueryWrapper orderSubLambdaQueryWrapper = new LambdaQueryWrapper<>(); orderSubLambdaQueryWrapper.eq(OrderSubPO::getOrderId,orderMainPO.getOrderId()); List orderSubPOList = orderSubRepo.list(orderSubLambdaQueryWrapper);