From 045f851915a24935dc98a021c1dde63b279470a7 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 2 Aug 2023 16:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basevehiclestate/BaseVehicleStateEnum.java    |  1 +
 .../biz/basevehiclestate/BaseVehicleStateMapper.xml   |  2 +-
 .../biz/basevehiclestate/BaseVehicleStateService.java | 11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java
index c94198f4e5..f05fa329d8 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java
@@ -76,6 +76,7 @@ public class BaseVehicleStateEnum {
         QKTCTJ("11", "欠款提车提交"),
         QKTCZZ("12", "欠款提车终止"),
         QKTCTG("13", "欠款提车审核通过"),
+        TC("14", "退车"),
 
         ;
 
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
index f1c5456120..5c607459b6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
@@ -4,7 +4,7 @@
     <select id="selectOnes" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
         select *
         from base_vehicle_state
-        where busSid = #{busSid} order by id desc limit 1
+        where busSid = #{busSid} and busState != '602' order by id desc limit 1
     </select>
 
     <select id="selevtByBusSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
index 4bb977ad6c..dbea6e867e 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
@@ -81,6 +81,10 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                 }else if(BaseVehicleStateEnum.OperateTypeEnum.QKTCTG.getTypeKey().equals(operateType)){
                     //欠款提车审核通过，将提车状态修改为1,0为未提交过，1为审核通过，2为审核中
                     baseVehicleState.setCarryVehicleState("1");
+                }else if(BaseVehicleStateEnum.OperateTypeEnum.TC.getTypeKey().equals(operateType)){
+                    //如果为终止或作废，则更新小状态为业务终止602
+                    baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.YWJS_STATE_2.getStateKey());
+                    baseVehicleState.setRemarks("退车");
                 }
                 baseMapper.updateById(baseVehicleState);
             }else{
@@ -125,6 +129,13 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                     baseVehicleState.setSaleTypeKey(busSalesOrder.getPayTypeKey());
                     baseVehicleState.setFinSourceKey(busSalesOrder.getFinancePlan());
                     baseMapper.insert(baseVehicleState);
+                }else if(BaseVehicleStateEnum.OperateTypeEnum.TC.getTypeKey().equals(operateType)){
+                    baseVehicleState = new BaseVehicleState();
+                    BeanUtil.copyProperties(dto, baseVehicleState, "sid");
+                    //如果为终止或作废，则更新小状态为业务终止602
+                    baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.YWJS_STATE_2.getStateKey());
+                    baseVehicleState.setRemarks("退车");
+                    baseMapper.insert(baseVehicleState);
                 }