diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 67f148f90f..2524079a89 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -85,6 +85,10 @@ import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehFeign import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo; +import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply; +import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyDetailsVo; +import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyFeign; +import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo; import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyFeign; import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApplyFeign; import com.yxt.anrui.riskcenter.api.loanvoucher.RskVoucher; @@ -192,6 +196,8 @@ public class FinPaymentrecordService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentrecordQuery query = pq.getParams(); @@ -603,19 +609,25 @@ public class FinPaymentrecordService extends MybatisBaseService appDetail(@PathVariable("sid") String sid); - + @ApiOperation("app详情") + @PostMapping("/pushRiskToFin") + @ResponseBody + ResultBean pushRiskToFin(@RequestParam("applySid") String applySid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java index e0cea65d63..95d6c89c66 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java @@ -119,4 +119,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper selectByBusVinSid2(@Param("busVinSid") String busVinSid); } 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 546cef87c8..cc7502384f 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 @@ -1059,4 +1059,27 @@ ) lbpv_sum ON lbpv_sum.saleVehSid = ss.busVinSid GROUP BY ss.busVinSid having beMoney>0 + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index 06c190ec0a..60221470b2 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java @@ -378,6 +378,9 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService selectByBusVinSid(String busVinSid) { return baseMapper.selectByBusVinSid(busVinSid); } + public List selectByBusVinSid2(String busVinSid) { + return baseMapper.selectByBusVinSid2(busVinSid); + } //逾期且累欠的金额 public String getYqLq(String busVinSid) { @@ -403,4 +406,6 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService appDetail(String sid) { return loanRepurchaseApplyService.appDetail(sid); } + + @Override + public ResultBean pushRiskToFin(String applySid) { + ResultBean rb = ResultBean.fireFail(); + loanRepurchaseApplyService.pushRiskToFin(applySid); + return rb.success(); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java index f935cdb44a..f67e2b8f30 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java @@ -20,6 +20,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderRetu import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank; +import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; +import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; @@ -46,6 +48,7 @@ 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.loanoverduefin.UrlQuery; +import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.*; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.flow.*; @@ -57,6 +60,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.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; import com.yxt.anrui.riskcenter.biz.loanrepurchasecompanycost.LoanRepurchaseCompanyCostService; import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService; import com.yxt.anrui.riskcenter.biz.loansettleapply.LoanSettleApplyService; @@ -139,6 +143,10 @@ public class LoanRepurchaseApplyService extends MybatisBaseService listPage(PagerQuery pq) { IPage page = PagerUtil.queryToPage(pq); @@ -740,7 +748,43 @@ public class LoanRepurchaseApplyService extends MybatisBaseService0){ + FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto(); + finPaymentrecordDto.setApplySid(loanRepurchaseApply.getSid()); + finPaymentrecordDto.setPayCompanySid(""); + finPaymentrecordDto.setPayType(1); + finPaymentrecordDto.setCreateOrgSid(loanRepurchaseApply.getUseOrgSid()); + finPaymentrecordDto.setUseOrgSid(loanRepurchaseApply.getUseOrgSid()); + finPaymentrecordDto.setCostTypeKey("008"); + finPaymentrecordDto.setCostTypeValue("资方结清款"); + finPaymentrecordDto.setCostTitleKey("014"); + finPaymentrecordDto.setCostTitleValue("资方结清款"); + finPaymentrecordDto.setReceiveBank(""); + finPaymentrecordDto.setReceiveBankAccount(loanRepurchaseCost.getBankAccount()); + finPaymentrecordDto.setReceiveCompany(loanRepurchaseCost.getAccountName()); + if(loanRepurchaseCost.getBankSettlePrice() != null){ + finPaymentrecordDto.setCost(loanRepurchaseCost.getBankSettlePrice().toString()); + finPaymentrecordDto.setAccountsReceive(loanRepurchaseCost.getBankSettlePrice().toString()); + } + finPaymentrecordDto.setBusSid(loanRepurchaseApply.getBillNo()); + finPaymentrecordDto.setPayRemark(loanRepurchaseApply.getPayRemarks()); + finPaymentrecordDto.setPayCode(""); + finPaymentrecordDto.setCreateBySid(loanRepurchaseApply.getCreateBySid()); + finPaymentrecordDto.setUpdateBySid(loanRepurchaseApply.getCreateBySid()); + finPaymentrecordDto.setRemarks(loanRepurchaseApply.getRemarks()); + finPaymentrecordDto.setPurchaseSystemSid(""); + finPaymentrecordDto.setPurchaseSystemName(""); + finPaymentrecordDto.setBusRemarks(loanRepurchaseApply.getPayRemarks()); + finPaymentrecordDto.setFinDataType(1); + String sid = finPaymentrecordFeign.save(finPaymentrecordDto).getData(); + + } + + } +/* try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() .setNameFormat("demo-pool-%d").build(); @@ -752,7 +796,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService list = loanRepaymentPlanDetailsService.selectByBusVinSid2(loanRepurchaseApply.getBusVinSid()); + list.removeAll(Collections.singleton(null)); + if(!list.isEmpty()){ + BigDecimal bankSettlePrice = loanRepurchaseCost.getBankSettlePrice(); + if(bankSettlePrice != null && bankSettlePrice.compareTo(BigDecimal.ZERO)>0){ + for (int jj = 0; jj < list.size(); jj++) { + LoanRepaymentPlanDetails loanRepaymentPlanDetails = list.get(jj); + String moneysl = loanRepaymentPlanDetails.getMoneysl(); + if(StringUtils.isNotBlank(moneysl) && bankSettlePrice.compareTo(BigDecimal.ZERO)>0){ + if(bankSettlePrice.compareTo(new BigDecimal(moneysl))>0){ + bankSettlePrice = bankSettlePrice.subtract(new BigDecimal(moneysl)); + BigDecimal paymentMoney = loanRepaymentPlanDetails.getPaymentMoney(); + if(paymentMoney != null){ + paymentMoney = paymentMoney.add(new BigDecimal(moneysl)); + }else{ + paymentMoney = new BigDecimal(moneysl); + } + loanRepaymentPlanDetails.setPaymentMoney(paymentMoney); + loanRepaymentPlanDetailsService.updateById(loanRepaymentPlanDetails); + }else{ + bankSettlePrice = BigDecimal.ZERO; + BigDecimal paymentMoney = loanRepaymentPlanDetails.getPaymentMoney(); + if(paymentMoney != null){ + paymentMoney = paymentMoney.add(bankSettlePrice); + }else{ + paymentMoney = bankSettlePrice; + } + loanRepaymentPlanDetails.setPaymentMoney(paymentMoney); + loanRepaymentPlanDetailsService.updateById(loanRepaymentPlanDetails); + } + }else{ + break; + } + } + } + } + + //推送凭证 if(loanRepurchaseApply != null){ List voucherResultDetailDtos = new ArrayList<>(); - LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(businessSid); DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(loanRepurchaseApply.getBankName(), "investorsCode").getData(); Voucher voucher = new Voucher(); SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(loanRepurchaseApply.getUseOrgSid()).getData();