From d29c653c1f1658f74ad79b48220bf30ba676a4c9 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 23 Jan 2024 14:24:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentrecordService.java | 53 +++++++++++++++++++ .../LoanBePadsincereVehFeign.java | 5 ++ .../LoanBePadsincereVehFeignFallback.java | 5 ++ .../LoanRepaymentPlanDetailsFeign.java | 9 ++++ ...LoanRepaymentPlanDetailsFeignFallback.java | 10 ++++ .../LoanRepaymentPlanMoneyVo.java | 13 +++++ .../LoanBePadsincereApplyService.java | 3 +- .../LoanBePadsincereVehRest.java | 7 +++ .../LoanRepaymentPlanDetailsMapper.java | 4 ++ .../LoanRepaymentPlanDetailsMapper.xml | 20 +++++++ .../LoanRepaymentPlanDetailsRest.java | 14 +++++ .../LoanRepaymentPlanDetailsService.java | 8 +++ .../AppBeCollectionRecordInit.java | 2 +- .../becollection/BeCollectionService.java | 5 ++ 14 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanMoneyVo.java 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 6151b9e002..86bc25e9b9 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 @@ -52,8 +52,10 @@ import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDet import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply; import com.yxt.anrui.fin.api.finpaymentrecord.*; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService; +import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService; import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService; import com.yxt.anrui.portal.api.flow.FlowableFeign; import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; @@ -66,6 +68,14 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.UserQuery; +import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApply; +import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyDetailsVo; +import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyFeign; +import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo; +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.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.ConstantUtils; @@ -148,6 +158,14 @@ public class FinPaymentrecordService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentrecordQuery query = pq.getParams(); @@ -339,6 +357,41 @@ public class FinPaymentrecordService extends MybatisBaseService list = new ArrayList<>(); for (int i = 0; i < sids.size(); i++) { FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i)); + //更新还款计划表垫款金额和逾期利息 + if ("007".equals(finPaymentrecord.getCostTypeKey())){ + List loanBePadsincereVehDetailsVos = loanBePadsincereVehFeign.selByMainSid(finPaymentrecord.getBusSid()).getData(); + for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) { + LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.selVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod()).getData(); + if (planDetails.getPaymentMoney() == null){ + planDetails.setPaymentMoney(new BigDecimal("0")); + } + if (planDetails.getPaymentInterest() == null){ + planDetails.setPaymentInterest(new BigDecimal("0")); + } + String paymentMoney = planDetails.getPaymentMoney().add(new BigDecimal(loanBePadsincereVehDetailsVo.getPadMoney())).toString(); + String paymentInterest = planDetails.getPaymentInterest().add(new BigDecimal(loanBePadsincereVehDetailsVo.getBankBeInter())).toString(); + loanRepaymentPlanDetailsFeign.updateVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod(),paymentMoney,paymentInterest); + //推送金融应收 + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(finPaymentrecord.getCreateBySid()); + SysUserVo userVo = sysUserFeign.fetchBySid(finPaymentrecord.getCreateBySid()).getData(); + jr.setCreateByName(userVo.getName()); + jr.setBusSid(planDetails.getSid()); + jr.setApplySid(finPaymentrecord.getBusSid()); + jr.setCurrentReceivableMoney(new BigDecimal(paymentInterest)); + jr.setReveivableMoney(new BigDecimal(paymentInterest)); + jr.setPayCostTitleKey("005"); + jr.setPayCostTitleValue("资方逾期利息"); + jr.setOrgSidPath(planDetails.getOrgSidPath()); + jr.setUseOrgName(planDetails.getUseOrgName()); + jr.setUseOrgSid(planDetails.getUseOrgSid()); + jr.setStaffDeptName(planDetails.getDept()); + jr.setStaffName(planDetails.getStaffName()); + jr.setStaffDeptSid(planDetails.getDeptSid()); + jr.setStaffUserSid(planDetails.getSalesUserSid()); + finUncollectedReceivablesDetailedJRService.insert(jr); + } + } FinPaymentrecord finPaymentrecordOne = null; if (new BigDecimal(dto.getCost()).compareTo(finPaymentrecord.getAccountsReceive())<0) {//实收金额小于应收金额 finPaymentrecordOne = new FinPaymentrecord(); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeign.java index 9a4e81c3ce..c27c497658 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeign.java @@ -75,4 +75,9 @@ public interface LoanBePadsincereVehFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据主表sid查询") + @GetMapping("/selByMainSid/{sid}") + @ResponseBody + ResultBean> selByMainSid(@PathVariable("applySid") String applySid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeignFallback.java index e2bde3aa9a..a2f37d7c51 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeignFallback.java @@ -69,4 +69,9 @@ public class LoanBePadsincereVehFeignFallback implements LoanBePadsincereVehFeig ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loanbepadsincereveh/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean> selByMainSid(String applySid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java index 303d827e78..208d34ef38 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java @@ -53,4 +53,13 @@ public interface LoanRepaymentPlanDetailsFeign { @ResponseBody public ResultBean checkOverDue(@RequestParam("sid") String sid); + @ApiOperation("根据销售订单车辆sid及期数查询") + @GetMapping("/selVehSidAndPeriod") + @ResponseBody + ResultBean selVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period); + + @ApiOperation("根据销售订单车辆sid及期数修改") + @PostMapping("/updateVehSidAndPeriod") + @ResponseBody + ResultBean updateVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period,@RequestParam("paymentMoney") String paymentMoney,@RequestParam("paymentInterest") String paymentInterest); } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java index 275ea11087..9a826e4ac3 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java @@ -46,4 +46,14 @@ public class LoanRepaymentPlanDetailsFeignFallback implements LoanRepaymentPlanD public ResultBean checkOverDue(String sid) { return null; } + + @Override + public ResultBean selVehSidAndPeriod(String busVinSid, String period) { + return null; + } + + @Override + public ResultBean updateVehSidAndPeriod(String busVinSid, String period, String paymentMoney, String paymentInterest) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanMoneyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanMoneyVo.java new file mode 100644 index 0000000000..6dddb44649 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanMoneyVo.java @@ -0,0 +1,13 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentplandetails; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class LoanRepaymentPlanMoneyVo { + + private BigDecimal paymentMoney; //公司垫款金额 + private BigDecimal paymentInterest; //垫资方逾期利息 + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java index bef3d057ac..4495feb24a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java @@ -61,6 +61,7 @@ import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetai import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDto; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo; import com.yxt.anrui.riskcenter.biz.loanbepadsincereveh.LoanBePadsincereVehService; import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService; @@ -910,7 +911,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService> selByMainSid(String applySid) { + ResultBean rb = ResultBean.fireFail(); + List loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(applySid); + return rb.success().setData(loanBePadsincereVehDetailsVos); + } } 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 c994591eee..259deab57c 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 @@ -66,4 +66,8 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper + + + UPDATE + loan_repayment_plan_details + SET + paymentMoney = #{paymentMoney}, + paymentInterest = #{paymentInterest} + WHERE busVinSid = #{busVinSid} + AND period = #{period} + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java index 560a7649a3..24b14be8e6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java @@ -56,4 +56,18 @@ public class LoanRepaymentPlanDetailsRest implements LoanRepaymentPlanDetailsFei public ResultBean checkOverDue(String sid) { return loanRepaymentPlanDetailsService.checkOverDue(sid); } + + @Override + public ResultBean selVehSidAndPeriod(String busVinSid, String period) { + ResultBean rb = ResultBean.fireFail(); + LoanRepaymentPlanDetails loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.selVehSidAndPeriod(busVinSid, period); + return rb.success().setData(loanRepaymentPlanDetails); + } + + @Override + public ResultBean updateVehSidAndPeriod(String busVinSid, String period, String paymentMoney, String paymentInterest) { + ResultBean rb = ResultBean.fireFail(); + loanRepaymentPlanDetailsService.updateVehSidAndPeriod(busVinSid, period, paymentMoney, paymentInterest); + return rb.success(); + } } 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 186e7e5649..d8fabacb5a 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 @@ -72,6 +72,7 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService savePlanDetails(LoanRepaymentPlanDetailsDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -184,4 +185,11 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService files = new ArrayList<>(); @ApiModelProperty("协议书模板下载地址") - private String xysDownLoadUrl = "D:\\anrui\\upload\\template\\协议书模板.pdf"; + private String xysDownLoadUrl; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java index 6c314d01da..0912a186cc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java @@ -66,6 +66,7 @@ import com.yxt.anrui.terminal.api.risk.becollection.flowable.*; import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppFinanceForm; import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo; import com.yxt.anrui.terminal.biz.base.common.CommonService; +import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -108,6 +109,8 @@ public class BeCollectionService { private CommonService commonService; @Autowired private FinVehicleInvoiceFeign finVehicleInvoiceFeign; + @Autowired + private DocPdfComponent docPdfComponent; public ResultBean agreeCreditInfo(CompleteBeCollectionDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -531,6 +534,8 @@ public class BeCollectionService { appBeCollectionRecordVehInits.add(appBeCollectionRecordVehInit); } appBeCollectionRecordInit.setAppBeCollectionRecordVehInitList(appBeCollectionRecordVehInits); + String prefixTemplateUrl = docPdfComponent.getPrefixTemplateUrl(); + appBeCollectionRecordInit.setXysDownLoadUrl(prefixTemplateUrl + "协议书模板.pdf"); return rb.success().setData(appBeCollectionRecordInit); }