交车提交接口修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java

@@ -39,6 +39,12 @@ public class BusHandoverWait extends BaseEntity {
     @ApiModelProperty("付款状态value")
     private String payStateValue;
 
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("车型别名")
+    private String modelName;
+
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java

@@ -45,4 +45,7 @@ public class BusHandoverWaitDto implements Dto {
     @ApiModelProperty("车型别名")
     private String modelName;
 
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bushandoverprepare;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.AppHandoverCertificateInfoVo;
@@ -320,12 +321,13 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
                 busHandoverWaitDto.setCustomerName(busHandoverPrepare.getCustomerName());
                 busHandoverWaitDto.setCustomerSid(busHandoverPrepare.getCustomerSid());
                 busHandoverWaitDto.setVinNo(handoverPrepareVehicleDto.getVinNo());
-                BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(busHandoverWaitDto.getVinNo()).getData();
+                BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(handoverPrepareVehicleDto.getVinNo(), busHandoverPrepare.getUseOrgSid()).getData();
                 if (data!=null){
                     busHandoverWaitDto.setVinSid(data.getSid());
                     busHandoverWaitDto.setModelSid(data.getModelSid());
                     busHandoverWaitDto.setModelName(data.getModelName());
                 }
+                busHandoverWaitDto.setUseOrgSid(busHandoverPrepare.getUseOrgSid());
                 busHandoverWaitDto.setPayTypeKey(busHandoverPrepare.getPayTypeKey());
                 busHandoverWaitDto.setPayTypeValue(busHandoverPrepare.getPayType());
                 busHandoverWaitService.saveAll(busHandoverWaitDto);