优化

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", "退车"),
 
         ;
 

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">

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);
                 }