diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index a0019cf440..5b72a77b11 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -3935,7 +3935,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid); + String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData(); + String bankSid = ""; + String scheduleSid = planDetails.getScheduleSid(); + LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData(); + if (isOther.equals("0")) { + if (StringUtils.isNotBlank(schedule.getBankSid())) { + bankSid = schedule.getBankSid(); + } + } else if (isOther.equals("1")) { + if (StringUtils.isNotBlank(schedule.getOtherBankSid())) { + bankSid = schedule.getOtherBankSid(); + } + } + ResultBean bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid); if (bankResultBean.getData() != null) { LoanFinBank loanFinBank = bankResultBean.getData(); if (null != loanFinBank.getReAdvances()) { @@ -3975,7 +3988,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid); + String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData(); + String bankSid = ""; + String scheduleSid = planDetails.getScheduleSid(); + LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData(); + if (isOther.equals("0")) { + if (StringUtils.isNotBlank(schedule.getBankSid())) { + bankSid = schedule.getBankSid(); + } + } else if (isOther.equals("1")) { + if (StringUtils.isNotBlank(schedule.getOtherBankSid())) { + bankSid = schedule.getOtherBankSid(); + } + } + ResultBean bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid); if (bankResultBean.getData() != null) { LoanFinBank loanFinBank = bankResultBean.getData(); if (null != loanFinBank.getReAdvances()) { diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java index 20da6c44b6..8493879a81 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeign.java @@ -123,4 +123,8 @@ public interface LoanFinBankFeign { @ResponseBody ResultBean reAdvancesByOrderSid(@RequestParam("orderSid") String orderSid); -} \ No newline at end of file + @ApiOperation("根据sid查询资方") + @GetMapping("/fetchEntityBySid") + @ResponseBody + ResultBean fetchEntityBySid(@RequestParam("sid") String sid); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java index 01020d39c0..2d851d4a69 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankFeignFallback.java @@ -80,4 +80,9 @@ public class LoanFinBankFeignFallback implements LoanFinBankFeign { return null; } -} \ No newline at end of file + @Override + public ResultBean fetchEntityBySid(String sid) { + return null; + } + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java index 779903550d..41c1f8119a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java @@ -97,6 +97,11 @@ public interface LoanRepaymentScheduleFeign { public ResultBean importSleepHistoryData(@RequestParam("userSid") String userSid); + @ApiOperation("根据还款计划明细返回资方sid") + @GetMapping("/returnBankOrOtherBankByPlanSid") + @ResponseBody + ResultBean returnBankOrOtherBankByPlanSid(@RequestParam("planSid") String planSid); + //-------------------------app接口-------------------- /** diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java index 4e7ffc0ce0..e881cfde4a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java @@ -88,6 +88,11 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule return null; } + @Override + public ResultBean returnBankOrOtherBankByPlanSid(String planSid) { + return null; + } + @Override public ResultBean> getRepaymentPlanList(PagerQuery pq) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java index 1e96bb1440..6fc4e94136 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java @@ -191,4 +191,11 @@ public class LoanFinBankRest implements LoanFinBankFeign { public ResultBean reAdvancesByOrderSid(String orderSid) { return loanFinBankService.reAdvancesByOrderSid(orderSid); } + + @Override + public ResultBean fetchEntityBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanFinBank loanFinBank = loanFinBankService.fetchBySid(sid); + return rb.success().setData(loanFinBank); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java index 7327786673..eb6f5ba226 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java @@ -651,7 +651,13 @@ public class LoanRepaymentHistoryService extends MybatisBaseService planDetails = loanRepaymentPlanDetailsService.selPlanByNoAndPeriod(repaymentExcelInfo.getBankContractNo(), repaymentExcelInfo.getPeriod()); if (!planDetails.isEmpty()) { for (LoanRepaymentPlanDetails planDetail : planDetails) { - String check = loanRepaymentPlanDetailsService.InsertForCheckPaymentAndBank(planDetail.getSid()); + String isOther = loanRepaymentScheduleService.returnBankOrOtherBankByPlanSid(planDetail.getSid()).getData(); + String check = ""; + if (isOther.equals("0")) { + check = loanRepaymentPlanDetailsService.InsertForCheckPaymentAndBank(planDetail.getSid()); + } else if (isOther.equals("1")) { + check = loanRepaymentPlanDetailsService.InsertForCheckPaymentAndBankOther(planDetail.getSid()); + } if (StringUtils.isNotBlank(check)) { if (!check.equals("0")) { LoanRepaymentHistory repaymentHistory = new LoanRepaymentHistory(); @@ -817,7 +823,13 @@ public class LoanRepaymentHistoryService extends MybatisBaseService planSids); String reAdvancesOrPaymentMoney(@Param("pSid") String pSid); + String reAdvancesOrPaymentMoneyOther(@Param("pSid") String pSid); DifferenceVo selDifference(@Param("pSid") String pSid); String InsertForCheckPaymentAndBank(@Param("sid") String sid); + String InsertForCheckPaymentAndBankOther(@Param("sid") String sid); int saveVehMark(@Param("busVinSid") String busVinSid,@Param("vehMark") String vehMark); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index ff65f93267..b6322c3547 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -5,13 +5,13 @@ insert into loan_repayment_plan_details(createBySid,sid,createTime,isEnable,salesOrderSid,loanContractSid,loanContractNo, policyName,bankContractNo,customer,customerSid,borrowerSid,borrowerName,`period`,scheduleSid,bankName,deptSid,dept,useOrgSid,useOrgName, - orgSidPath,busVinSid,vinNo,vehMark,policyOrOther,dueMoney,dueDate,updateTime,oweState) + orgSidPath,busVinSid,vinNo,vehMark,policyOrOther,dueMoney,dueDate,updateTime) values (#{item.createBySid},#{item.sid},#{item.createTime},#{item.isEnable},#{item.salesOrderSid},#{item.loanContractSid},#{item.loanContractNo}, #{item.policyName},#{item.bankContractNo},#{item.customer},#{item.customerSid},#{item.borrowerSid},#{item.borrowerName}, #{item.period},#{item.scheduleSid},#{item.bankName},#{item.deptSid},#{item.dept},#{item.useOrgSid},#{item.useOrgName},#{item.orgSidPath}, - #{item.busVinSid},#{item.vinNo},#{item.vehMark},#{item.policyOrOther},#{item.dueMoney},#{item.dueDate},#{item.updateTime},#{item.oweState}) + #{item.busVinSid},#{item.vinNo},#{item.vehMark},#{item.policyOrOther},#{item.dueMoney},#{item.dueDate},#{item.updateTime}) @@ -229,6 +229,20 @@ LEFT JOIN loan_fin_bank as b ON b.sid = s.bankSid WHERE p.sid = #{pSid} + + +