From 457ebde0682d8e826c3de56208ea3db7f58c6e1c Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Fri, 1 Aug 2025 21:43:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BD=A6=E8=BE=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sczx/order/dto/OrderDTO.java | 4 ++++ .../com/sczx/order/service/impl/OrderServiceImpl.java | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) 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);