Merge pull request '变更车辆增加车辆状态调整' (#5) from zhangli-test into main

Reviewed-on: #5
This commit is contained in:
2025-09-08 02:03:05 +08:00

View File

@ -875,6 +875,9 @@ public class OrderServiceImpl implements OrderService {
if(!orderMainPO.getOrderStatus().equals(OrderStatusEnum.RENT_ING.getCode())){ if(!orderMainPO.getOrderStatus().equals(OrderStatusEnum.RENT_ING.getCode())){
throw new BizException("订单非租车状态,不能变更车辆"); throw new BizException("订单非租车状态,不能变更车辆");
} }
if(!orderMainPO.getStoreId().equals(carDTO.getStoreId())){
throw new BizException("车辆得当前门店车辆");
}
LambdaQueryWrapper<OrderSubPO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderSubPO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(OrderSubPO::getOrderId, orderMainPO.getOrderId()) queryWrapper.eq(OrderSubPO::getOrderId, orderMainPO.getOrderId())
@ -912,12 +915,20 @@ public class OrderServiceImpl implements OrderService {
orderCarImgRepo.saveBatch(carImagePOList); orderCarImgRepo.saveBatch(carImagePOList);
} }
//变更车辆状态 //变更车辆状态为租赁中
LambdaUpdateWrapper<CarPO> carPOLambdaUpdateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<CarPO> carPOLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
carPOLambdaUpdateWrapper.eq(CarPO::getId, carDTO.getId()) carPOLambdaUpdateWrapper.eq(CarPO::getId, carDTO.getId())
.set(CarPO::getBrsStatus, CarStatusEnum.RENT_ING.getCode()); .set(CarPO::getBrsStatus, CarStatusEnum.RENT_ING.getCode());
carRepo.update(carPOLambdaUpdateWrapper); carRepo.update(carPOLambdaUpdateWrapper);
//变更旧车辆为空闲
LambdaUpdateWrapper<CarPO> oldCarPOLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
oldCarPOLambdaUpdateWrapper.eq(CarPO::getId, orderMainPO.getVehicleId())
.set(CarPO::getBrsStatus, CarStatusEnum.NORMAL.getCode());
carRepo.update(oldCarPOLambdaUpdateWrapper);
//记录变更记录 //记录变更记录
OrderCarChangePO orderCarChangePO = new OrderCarChangePO(); OrderCarChangePO orderCarChangePO = new OrderCarChangePO();
orderCarChangePO.setOrderId(orderMainPO.getOrderId()); orderCarChangePO.setOrderId(orderMainPO.getOrderId());