sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单接口增加车辆信息

Browse Source
This commit is contained in:
zhangli
2025-08-01 21:43:32 +08:00
parent 720acef4f4
commit 457ebde068
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sczx/order/dto/OrderDTO.java
View File

@ -1,6 +1,7 @@
package com.sczx.order.dto; package com.sczx.order.dto;
import com.fasterxml.jackson.annotation.JsonFormat; 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.CarModelSimpleDTO;
import com.sczx.order.thirdpart.dto.CompanyStoreDTO; import com.sczx.order.thirdpart.dto.CompanyStoreDTO;
import com.sczx.order.thirdpart.dto.RentBatteyRuleDTO; import com.sczx.order.thirdpart.dto.RentBatteyRuleDTO;
@ -42,6 +43,9 @@ public class OrderDTO {
@ApiModelProperty("车辆ID") @ApiModelProperty("车辆ID")
private Long vehicleId; private Long vehicleId;
@ApiModelProperty("车辆信息")
private CarDTO carDTO;
@ApiModelProperty("车型ID") @ApiModelProperty("车型ID")
private Long carModelId; private Long carModelId;

11
src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
View File

@ -189,15 +189,22 @@ public class OrderServiceImpl implements OrderService {
OrderDTO orderDTO = OrderConvert.INSTANCE.poToDto(orderMainPO); OrderDTO orderDTO = OrderConvert.INSTANCE.poToDto(orderMainPO);
//获取门店信息 //获取门店信息
CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(orderMainPO.getStoreId().toString())); CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(orderMainPO.getStoreId().toString()));
orderDTO.setCompanyStoreDTO(companyStoreDTO);
CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(orderMainPO.getCarModelId()); CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(orderMainPO.getCarModelId());
orderDTO.setCarModelSimpleDTO(carModelSimpleDTO);
RentBatteyRuleDTO rentBatteyRuleDTO = null; RentBatteyRuleDTO rentBatteyRuleDTO = null;
if(orderMainPO.getRentBatteyRuleId()!=null){ if(orderMainPO.getRentBatteyRuleId()!=null){
rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(orderMainPO.getRentBatteyRuleId()); rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(orderMainPO.getRentBatteyRuleId());
orderDTO.setRentBatteyRule(rentBatteyRuleDTO); 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<OrderSubPO> orderSubLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderSubPO> orderSubLambdaQueryWrapper = new LambdaQueryWrapper<>();
orderSubLambdaQueryWrapper.eq(OrderSubPO::getOrderId,orderMainPO.getOrderId()); orderSubLambdaQueryWrapper.eq(OrderSubPO::getOrderId,orderMainPO.getOrderId());
List<OrderSubPO> orderSubPOList = orderSubRepo.list(orderSubLambdaQueryWrapper); List<OrderSubPO> orderSubPOList = orderSubRepo.list(orderSubLambdaQueryWrapper);