Merge remote-tracking branch 'origin/master'

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

@@ -105,4 +105,8 @@ public interface BusSalesOrderLoancontractFeign {
     @ResponseBody
     ResultBean pushOtherReceivable(@RequestBody LoanOtherReceivablePush loanOtherReceivablePush);
 
+    @ApiOperation("根据销售订单sid查询")
+    @GetMapping("/fetchAllByOrderSid/{orderSid}")
+    @ResponseBody
+    public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSid(@PathVariable("orderSid") String sid);
 }

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

@@ -99,4 +99,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
 	public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSid(String sid) {
+		return null;
+	}
 }

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

@@ -77,4 +77,7 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper<BusSalesOrde
 
     @Update("update bus_sales_order_loancontract set bankContractNo=#{bankContractNo},busNo='305',busName='放款资料审核' where sid=#{loanContractSid}")
     void updateBankConAndBusNo(@Param("loanContractSid") String loanContractSid,@Param("bankContractNo") String bankContractNo);
+
+    @Select("select * from bus_sales_order_loancontract where salesOrderSid = #{sid}")
+    List<BusSalesOrderLoancontract> fetchAllByOrderSid(String sid);
 }

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

@@ -128,4 +128,9 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
 	public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) {
 		return busSalesOrderLoancontractService.pushOtherReceivable(loanOtherReceivablePush);
 	}
+
+	@Override
+	public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSid(String sid) {
+		return busSalesOrderLoancontractService.fetchAllByOrderSid(sid);
+	}
 }

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

@@ -479,4 +479,10 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
         }
         return rb.success();
     }
+
+    public ResultBean<List<BusSalesOrderLoancontract>> fetchAllByOrderSid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = baseMapper.fetchAllByOrderSid(sid);
+        return rb.success().setData(busSalesOrderLoancontracts);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java

@@ -30,10 +30,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.*;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDetailsVo;
@@ -42,6 +44,7 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvest
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto;
+import com.yxt.anrui.riskcenter.biz.loancapitalcreditresult.LoanCapitalCreditResultService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -81,6 +84,8 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
     @Autowired
     private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
     @Autowired
+    private LoanCapitalCreditResultService loanCapitalCreditResultService;
+    @Autowired
     private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
     @Autowired
     private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign;
@@ -399,6 +404,15 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
             }
         }
         this.updateByDto(dto);
+        List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByOrderSid(dto.getSaleOrderSid()).getData();
+        if (busSalesOrderLoancontracts != null){
+            for (BusSalesOrderLoancontract busSalesOrderLoancontract : busSalesOrderLoancontracts) {
+                LoanCapitalCreditResultDto loanCapitalCreditResultDto = new LoanCapitalCreditResultDto();
+                loanCapitalCreditResultDto.setSaleOrderSid(dto.getSaleOrderSid());
+                loanCapitalCreditResultDto.setLoanContractSid(busSalesOrderLoancontract.getSid());
+                loanCapitalCreditResultService.saveOrUpdateDto(loanCapitalCreditResultDto);
+            }
+        }
     }
 
     public void insertByDto(LoanHomevisitFileexamineDto dto) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml

@@ -54,6 +54,7 @@
                bo.`staffName`,
                bo.`contractNo`,
                bb.`vehCount`,
+               lp.saleOrderBorrowerSid AS borrowerSid,
                bb.`borrowerName`,
                bb.`mobile`,
                bb.`bankName`,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -238,7 +238,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 BusSalesOrderLoancontractDto busSalesOrderLoancontractDto = new BusSalesOrderLoancontractDto();
                 busSalesOrderLoancontractDto.setSalesOrderSid(loanHomevisitPrepVo.getSaleOrderSid());
-                busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getSid());
+                busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getBorrowerSid());
                 busSalesOrderLoancontractDto.setBorrowerName(loanHomevisitPrepVo.getBorrowerName());
                 busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount());
                 BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();
@@ -255,7 +255,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         } else if (conSetUpKey.equals("002")) {//一人一合同
             BusSalesOrderLoancontractDto busSalesOrderLoancontractDto = new BusSalesOrderLoancontractDto();
             busSalesOrderLoancontractDto.setSalesOrderSid(loanHomevisitPrepVo.getSaleOrderSid());
-            busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getSid());
+            busSalesOrderLoancontractDto.setBorrowerSid(loanHomevisitPrepVo.getBorrowerSid());
             busSalesOrderLoancontractDto.setBorrowerName(loanHomevisitPrepVo.getBorrowerName());
             busSalesOrderLoancontractDto.setVehCount(loanHomevisitPrepVo.getVehCount());
             BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanHomevisitPrepVo.getSaleOrderSid()).getData();