优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.basevehiclestate;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -12,4 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BaseVehicleStateMapper extends BaseMapper<BaseVehicleState> {
     BaseVehicleState selectOnes(String busSid);
+
+    BusSalesOrder selevtByBusSid(String busSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml

@@ -6,4 +6,10 @@
         from base_vehicle_state
         where busSid = #{busSid} order by id desc limit 1
     </select>
+
+    <select id="selevtByBusSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
+        select bo.* from anrui_buscenter.bus_sales_order bo
+        left join anrui_buscenter.bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
+        where bv.sid = #{busSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Service;
@@ -93,6 +94,36 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                     baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
                     baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
+                    BusSalesOrder busSalesOrder = baseMapper.selevtByBusSid(baseVehicleState.getBusSid());
+                    baseVehicleState.setSaleTypeKey(busSalesOrder.getPayTypeKey());
+                    baseVehicleState.setFinSourceKey(busSalesOrder.getFinancePlan());
+                    baseMapper.insert(baseVehicleState);
+                }else if (BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey().equals(operateType)) {
+                    baseVehicleState = new BaseVehicleState();
+                    BeanUtil.copyProperties(dto, baseVehicleState, "sid");
+                    //认款办理确认以及结转审核通过的更新款项状态为1  已交清，否则为0
+                    baseVehicleState.setFinState(BaseVehicleStateEnum.BusStateEnum.FIN_STATE_JQ.getStateKey());
+                    baseVehicleState.setCarryVehicleState("0");
+                    baseVehicleState.setCarryInvoiceState("0");
+                    baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
+                    baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
+                    baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
+                    BusSalesOrder busSalesOrder = baseMapper.selevtByBusSid(baseVehicleState.getBusSid());
+                    baseVehicleState.setSaleTypeKey(busSalesOrder.getPayTypeKey());
+                    baseVehicleState.setFinSourceKey(busSalesOrder.getFinancePlan());
+                    baseMapper.insert(baseVehicleState);
+                }else if(BaseVehicleStateEnum.OperateTypeEnum.QKTCTJ.getTypeKey().equals(operateType)){
+                    baseVehicleState = new BaseVehicleState();
+                    BeanUtil.copyProperties(dto, baseVehicleState, "sid");
+                    //欠款提车提交后，将提车状态修改为1,0为未提交过，1为审核通过，2为审核中
+                    baseVehicleState.setCarryVehicleState("2");
+                    baseVehicleState.setFinState("0");
+                    baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
+                    baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
+                    baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_2.getStateKey());
+                    BusSalesOrder busSalesOrder = baseMapper.selevtByBusSid(baseVehicleState.getBusSid());
+                    baseVehicleState.setSaleTypeKey(busSalesOrder.getPayTypeKey());
+                    baseVehicleState.setFinSourceKey(busSalesOrder.getFinancePlan());
                     baseMapper.insert(baseVehicleState);
                 }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -50,6 +50,7 @@ import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto;
 import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
 import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
 import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;