From 449b0632e91e052beb033a31255a8cf6ddb19074 Mon Sep 17 00:00:00 2001
From: 19173159168 <majian314@163.com>
Date: Sun, 7 Sep 2025 19:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E7=BB=93=E6=9D=9F=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9B=B4=E6=96=B0=E8=BD=A6=E8=BE=86=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?brsStatus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/operation/util/CarStatusEnum.java  | 3 +--
 .../com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/operation/ZcCarMapper.xml        | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

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"
             <if test="purchasePrice != null">purchase_price = #{purchasePrice},</if>
             <if test="belongType != null">belong_type = #{belongType},</if>
             <if test="images != null">images = #{images},</if>
-            <if test="brsStatus != null">brs_status = #{brsStatus},</if>
+            <if test="brsStatus != null and brsStatus != ''">brs_status = #{brsStatus},</if>
             <if test="iotStatus != null">iot_status = #{iotStatus},</if>
             <if test="iotCode != null">iot_code = #{iotCode},</if>
             <if test="operatorId != null">operator_id = #{operatorId},</if>