优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java

@@ -139,5 +139,7 @@ public interface BaseTrailerFeign {
     @GetMapping("/fetchByGcVinNo/{gcVinNo}")
     ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(@PathVariable("gcVinNo") String gcVinNo);
 
-
+    @ApiOperation("根据挂车车架号和车辆sid获取一条记录")
+    @PostMapping("/fetchByGcVinNoAndVehSid")
+    ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(@RequestParam("gcVinNo") String gcVinNo,@RequestParam("vehSid") String vehSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@@ -103,4 +103,7 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
 
     @Select("select * from base_trailer where vehSid = #{vehSid}")
     List<BaseTrailer> getByVehSid(@Param("vehSid") String vehSid);
+
+    @Select("select * from base_trailer where vinNo = #{gcVinNo} and vehSid = #{vehSid}")
+    BaseTrailerDetailsVo fetchByGcVinNoAndVehSid(@Param("gcVinNo") String gcVinNo,@Param("vehSid") String vehSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java

@@ -131,4 +131,9 @@ public class BaseTrailerRest implements BaseTrailerFeign {
 	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(String gcVinNo) {
 		return baseTrailerService.fetchByGcVinNo(gcVinNo);
 	}
+
+	@Override
+	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
+		return baseTrailerService.fetchByGcVinNoAndVehSid(gcVinNo,vehSid);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -943,4 +943,10 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         List<BaseTrailer> baseTrailers = baseMapper.getByVehSid(vehSid);
         return rb.success().setData(baseTrailers);
     }
+
+    public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNoAndVehSid(gcVinNo,vehSid);
+        return rb.success().setData(baseTrailerDetailsVo);
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -114,7 +114,7 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
     }
 
     @Override
-    public ResultBean updateXDCon(String sid, String borrowerSid, String loanContractSid) {
+    public ResultBean updateXDCon(String sid, String loanContractSid) {
         return null;
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -434,7 +434,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             TraliveredVo data = baseTrailerFeign.trailerList(record.getVinSid(), record.getContractId()).getData();
             List<TrailerVo> list = data.getList();
             List<PcSelBillGcVo> pcSelBillGcVos = new ArrayList<>();
-            if (list != null && list.size() > 0){
+            if (list != null && list.size() > 0) {
                 for (TrailerVo trailerVo : list) {
                     PcSelBillGcVo pcSelBillGcVo = new PcSelBillGcVo();
                     pcSelBillGcVo.setGcVinNo(trailerVo.getTrailerVinNo());
@@ -483,12 +483,27 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 String vehSid = finBillVehicleDto.getVehSid();
                 TraliveredVo data = baseTrailerFeign.trailerList(vehSid, dto.getContractNo()).getData();
                 List<TrailerVo> list = data.getList();
-                for (TrailerVo trailerVo : list) {
-                    FinBillTrailer finBillTrailer = new FinBillTrailer();
-                    finBillTrailer.setGcVinNo(trailerVo.getTrailerVinNo());
-                    finBillTrailer.setVinNo(finBillVehicleDto.getVinNo());
-                    finBillTrailer.setBillAppSid(finBillApplication.getSid());
-                    finBillTrailerService.save(finBillTrailer);
+                if (finBillTrailers != null && finBillTrailers.size() > 0) {
+                    for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
+                        FinBillTrailer finBillTrailer = new FinBillTrailer();
+                        BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
+                        finBillTrailer.setBillAppSid(finBillApplication.getSid());
+                        if (finBillVehicle.getVinNo().equals(finBillTrailerDto.getVinNo())) {
+                            finBillTrailer.setBillTypeKey(finBillVehicle.getBillTypeKey());
+                            finBillTrailer.setBillTypeValue(finBillVehicle.getBillTypeValue());
+                            finBillTrailer.setOpenTickSid(finBillVehicle.getOpenTickSid());
+                            finBillTrailer.setOpenTickName(finBillVehicle.getOpenTickName());
+                            finBillTrailerService.save(finBillTrailer);
+                        }
+                    }
+                } else {
+                    for (TrailerVo trailerVo : list) {
+                        FinBillTrailer finBillTrailer = new FinBillTrailer();
+                        finBillTrailer.setGcVinNo(trailerVo.getTrailerVinNo());
+                        finBillTrailer.setVinNo(finBillVehicleDto.getVinNo());
+                        finBillTrailer.setBillAppSid(finBillApplication.getSid());
+                        finBillTrailerService.save(finBillTrailer);
+                    }
                 }
             }
             //附件信息
@@ -682,7 +697,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
                 FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid).get(0);
                 finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
-                BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData();
+                BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNoAndVehSid(finBillTrailerVo.getGcVinNo(), finBillVehicleVo.getVehSid()).getData();
                 List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
                 List<String> hgzImageUrls = new ArrayList<>();
                 for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {