Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanOtherReceivablePush.java

@@ -14,4 +14,5 @@ public class LoanOtherReceivablePush {
     private String borrowerSid;
     @ApiModelProperty("销售订单sid")
     private String saleOrderSid;
+    private String loanContractSid;
 }

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

@@ -139,6 +139,11 @@ public interface BusSalesOrderVehicleFeign {
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid);
 
+    @ApiOperation("根据贷款人sid查询车辆")
+    @GetMapping("/selectOneByBorrowerSid2")
+    @ResponseBody
+    ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(@RequestParam("borrowerSid") String borrowerSid,@RequestParam("contractSid")String contractSid);
+
     @ApiOperation("根据销售订单sid和贷款人sid查车辆信息")
     @PostMapping("/selectListByOrderSidAndDkrSid")
     @ResponseBody

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

@@ -133,6 +133,11 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(String borrowerSid, String contractSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         return null;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -352,7 +352,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                 //-----------获取其他应收单对象----------------
                 CapitalCreditResult creditResult = new CapitalCreditResult();
                 //根据销售订单的贷款人sid查询车辆表中的数据
-                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(borrowerDetailsVo.getSid());
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid2(borrowerDetailsVo.getSid(),loanOtherReceivablePush.getLoanContractSid());
                 if (null != busSalesOrderVehicle) {
                     String customerNumber = "";
                     //判断财务系统是否有客户

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -148,6 +148,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.selectOneByBorrowerSid(borrowerSid);
     }
 
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(String borrowerSid, String contractSid) {
+        return busSalesOrderVehicleService.selectOneByBorrowerSid2(borrowerSid,contractSid);
+    }
+
     @Override
     public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         ResultBean rb = ResultBean.fireFail();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -624,6 +624,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return rb.success().setData(busSalesOrderVehicle);
     }
 
+    public ResultBean<BusSalesOrderVehicle> selectOneByBorrowerSid2(String borrowerSid,String contractSid) {
+        ResultBean<BusSalesOrderVehicle> rb = ResultBean.fireFail();
+        BusSalesOrderVehicle busSalesOrderVehicle = selectByBorrowSid2(borrowerSid,contractSid);
+        return rb.success().setData(busSalesOrderVehicle);
+    }
+
     public List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         return baseMapper.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid);
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

@@ -206,6 +206,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
             loanContractPush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
             BusSalesOrderLoancontractDetailsVo loancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(loanCapitalCreditResult.getLoanContractSid()).getData();
             loanOtherReceivablePush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
+            loanOtherReceivablePush.setLoanContractSid(loanCapitalCreditResult.getLoanContractSid());
             String borrowerSid = "";
             if (loancontractDetailsVo != null) {
                 loanOtherReceivablePush.setBorrowerSid(loancontractDetailsVo.getBorrowerSid());
@@ -215,7 +216,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
             //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单
             ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
             //资方信审终审通过后修改车辆业务状态中的资方终审为1.
-            ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
+            ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid2(borrowerSid,loanCapitalCreditResult.getLoanContractSid());
             if (busSalesOrderVehicle.getData() != null) {
                 ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid());
             }