diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/util/CarStatusEnum.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/util/CarStatusEnum.java index 73f1b12..04b8154 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/util/CarStatusEnum.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/util/CarStatusEnum.java @@ -3,8 +3,7 @@ package com.ruoyi.operation.util; public enum CarStatusEnum { CAR_STATUS_0("0", "正常"), - CAR_STATUS_1("1", "下架"), - CAR_STATUS_9("9", "租赁中"); + CAR_STATUS_1("1", "下架"); private final String code; private final String info; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java index 26fed0f..5c8bc31 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java @@ -179,7 +179,7 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService // 5. 释放车辆状态 ZcCar zcCar = new ZcCar(); zcCar.setId(queryOrder.getVehicleId()); - zcCar.setStatus(CarStatusEnum.CAR_STATUS_0.getCode()); + zcCar.setBrsStatus("0"); zcCarService.updateZcCar(zcCar); logger.info("手动结束订单处理完成,订单ID: {}", orderId); diff --git a/ruoyi-admin/src/main/resources/mapper/operation/ZcCarMapper.xml b/ruoyi-admin/src/main/resources/mapper/operation/ZcCarMapper.xml index a16c79f..00bbc70 100644 --- a/ruoyi-admin/src/main/resources/mapper/operation/ZcCarMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/operation/ZcCarMapper.xml @@ -199,7 +199,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" purchase_price = #{purchasePrice}, belong_type = #{belongType}, images = #{images}, - brs_status = #{brsStatus}, + brs_status = #{brsStatus}, iot_status = #{iotStatus}, iot_code = #{iotCode}, operator_id = #{operatorId},