Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java

@@ -718,8 +718,10 @@ public class LoanLawsuitApplyService extends MybatisBaseService<LoanLawsuitApply
                     pushCaseDto.setVehList(vehList);
                 }
                 LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.fetchByBorrowerSid(lawsuitApply.getLoanSid());
-                pushCaseDto.setLoanId(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber());
-                pushCaseDto.setLoanAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
+               if(loanHomevisitInvestigateCustomerDetailsVo != null){
+                   pushCaseDto.setLoanId(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerIdNumber());
+                   pushCaseDto.setLoanAddress(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerDomAddress());
+               }
                 pushCaseDto.setIsZfull("0");
                 loanCaseProgressService.pushCase(pushCaseDto);
             } else {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

@@ -47,6 +47,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageSaveDto;
@@ -61,6 +62,7 @@ import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCostVo;
 import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCostVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanfinbank.LoanFinBankService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loanrelievemortgage.LoanRelieveMortgageService;
 import com.yxt.anrui.riskcenter.biz.loanrepurchasecompanycost.LoanRepurchaseCompanyCostService;
@@ -150,6 +152,8 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
     private FinPaymentrecordFeign finPaymentrecordFeign;
     @Autowired
     private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
+    @Autowired
+    private LoanFinBankService loanFinBankService;
 
     public PagerVo<LoanRepurchaseApplyVo> listPage(PagerQuery<LoanRepurchaseApplyQuery> pq) {
         IPage<LoanRepurchaseApply> page = PagerUtil.queryToPage(pq);
@@ -867,6 +871,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                             }else{
                                 paymentMoney = bankSettlePrice;
                             }
+                            bankSettlePrice = bankSettlePrice.subtract(bankSettlePrice);
                             loanRepaymentPlanDetails.setPaymentMoney(paymentMoney);
                             loanRepaymentPlanDetailsService.updateById(loanRepaymentPlanDetails);
                         }
@@ -937,6 +942,10 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                     Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                     voucherResultDetailDtoDf.setSummary(loanRepurchaseApply.getBankName() + "个贷保证金抵结清款");
                     voucherResultDetailDtoDf.setSubjectNo("1009.01.00");
+                    LoanFinBank loanFinBank = loanFinBankService.fetchBySid(loanRepurchaseApply.getBankSid());
+                    if(loanFinBank != null){
+                        voucherResultDetailDtoDf.setBank(loanFinBank.getBankNo());
+                    }
                     //核算部门
                     voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
                     //核算客户