From 65425d50d54ebd687e54bce4603c4a3ff7d18965 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 2 Jan 2024 16:55:30 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E4=BF=9D=E5=AD=98=E5=AE=9E=E9=99=85=E8=BF=98=E6=AC=BE?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/terminal/api/risk/becollection/BeCollectionFeign.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java index 9b8f505fcf..8d229ead67 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java @@ -38,7 +38,7 @@ public interface BeCollectionFeign { public ResultBean padsincereDetail(@PathVariable("sid") String sid); @ApiOperation("初始化实际还款人") - @PostMapping("/initReaRepayment") + @GetMapping("/initReaRepayment") public ResultBean initReaRepayment(@RequestParam("saleVehSid") String saleVehSid); @ApiOperation("维护实际还款人") From af9588c33d0865b6ecece20e1a0743583baafc08 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 2 Jan 2024 17:30:58 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9C=88=E8=BF=98=E8=AE=A1=E6=8F=90?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=87=AD=E8=AF=81=E3=80=81=E8=BD=AC=E4=BB=98?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8E=A8=E9=80=81=E8=BD=AC=E4=BB=98=E6=9C=88?= =?UTF-8?q?=E8=BF=98=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 160 ++++++++---------- .../fin/biz/kingdee/FinKingDeeFeignRest.java | 6 +- .../biz/kingdee/voucher/VoucherService.java | 20 ++- .../LoanMonthlyAccrualApplyService.java | 35 +++- .../LoanTransferPaymentApplyService.java | 16 ++ 5 files changed, 137 insertions(+), 100 deletions(-) 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 97fd6cc7a4..b9a2d6e5b4 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 @@ -112,6 +112,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; import java.util.function.Predicate; @@ -3684,7 +3686,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService= 0) { + //未逾期 + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(collDate); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } else { + //已逾期 + historyEntity.setPrepareDate(new DateTime()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + historyEntity.setReturnWay("间还"); + historyEntity.setReturnWayKey("02"); + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); } loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); } @@ -3740,86 +3759,33 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { - historyEntity.setPrepareDate(new DateTime()); - } else { - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.setTime(dueDate); - cal_1.add(Calendar.DAY_OF_MONTH, -1); - historyEntity.setPrepareDate(cal_1.getTime()); - } - historyEntity.setPrepareDate(new DateTime()); - historyEntity.setPlanDetailSid(planSid); - historyEntity.setScheduleSid(planDetails.getScheduleSid()); - loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); - } else { BigDecimal paymentMoney = planDetails.getPaymentMoney(); String subscriptionMoney = v.getSubscriptionMoney(); BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); planDetails.setPaymentMoney(subtract); loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); + if (loanFinBank.getReAdvances() == 1) { + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + SysUserVo userVo = sysUserFeign.fetchBySid(sid).getData(); + jr.setCreateByName(userVo.getName()); + jr.setBusSid(planSid); + jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney())); + jr.setPayCostTitleKey("007"); + 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); } } } - } else { - LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); - historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); - historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); - historyEntity.setActualDate(new DateTime()); - historyEntity.setReturnWay("间还"); - historyEntity.setReturnWayKey("02"); - historyEntity.setPaymentState("待转付"); - historyEntity.setPaymentStateKey("001"); - Date dueDate = planDetails.getDueDate(); - if (new Date().compareTo(dueDate) > 0) { - historyEntity.setPrepareDate(new DateTime()); - } else { - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.setTime(dueDate); - cal_1.add(Calendar.DAY_OF_MONTH, -1); - historyEntity.setPrepareDate(cal_1.getTime()); - } - historyEntity.setPrepareDate(new DateTime()); - historyEntity.setPlanDetailSid(planSid); - historyEntity.setScheduleSid(planDetails.getScheduleSid()); - loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); - - } - } else { - LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); - historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); - historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); - historyEntity.setActualDate(new DateTime()); - historyEntity.setReturnWay("间还"); - historyEntity.setReturnWayKey("02"); - historyEntity.setPaymentState("待转付"); - historyEntity.setPaymentStateKey("001"); - Date dueDate = planDetails.getDueDate(); - if (new Date().compareTo(dueDate) > 0) { - historyEntity.setPrepareDate(new DateTime()); - } else { - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.setTime(dueDate); - cal_1.add(Calendar.DAY_OF_MONTH, -1); - historyEntity.setPrepareDate(cal_1.getTime()); } - historyEntity.setPrepareDate(new DateTime()); - historyEntity.setPlanDetailSid(planSid); - historyEntity.setScheduleSid(planDetails.getScheduleSid()); - loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); - } - } } }); @@ -4098,8 +4064,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService accrualInit(String orgPath) { ResultBean rb = ResultBean.fireFail(); String orgSidPath = orgPath; @@ -683,9 +688,33 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService records = loanMonthlyAccrualRecordService.selByMainSid(businessSid); if (!records.isEmpty()) { - - - + for (LoanMonthlyAccrualRecord v : records) { + LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchDetails(v.getRecordSid()).getData(); + if (null != planDetails) { + GeneralVoucher generalVoucher = new GeneralVoucher(); + List voucherDetails = new ArrayList<>(); + String useOrgSid = planDetails.getUseOrgSid(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + if (null != organizationVo) { + generalVoucher.setUseOrgCode(organizationVo.getOrgCode()); + } + String deptSid = planDetails.getDeptSid(); + GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); + SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); + if (null != organizationDeptVo) { + voucherDetail.setDeptCode(organizationDeptVo.getOrgCode()); + } + String busVinSid = planDetails.getBusVinSid(); + BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData(); + if (null != orderVehicle) { + voucherDetail.setCustomerCode(orderVehicle.getTemporaryNo()); + } + voucherDetail.setAmount(planDetails.getDueMoney()); + voucherDetails.add(voucherDetail); + generalVoucher.setVoucherDetails(voucherDetails); + finKingDeeFeign.saveAccrualVoucher(generalVoucher); + } + } } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java index 757d7e98f1..5c4cf98d63 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java @@ -53,6 +53,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; @@ -591,6 +592,21 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService Date: Tue, 2 Jan 2024 17:50:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=80=BE=E6=9C=9F=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB=E5=82=AC=E6=94=B6=E6=8A=A5?= =?UTF-8?q?null=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loanbecollectionrecord/LoanBeCollectionRecordService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java index 8344190612..a3b1336111 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java @@ -237,7 +237,6 @@ public class LoanBeCollectionRecordService extends MybatisBaseService Date: Wed, 3 Jan 2024 15:15:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=82=AC?= =?UTF-8?q?=E6=94=B6=E5=BD=95=E5=85=A5=E6=8C=89=E7=85=A7=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBeCollectionRecordVehInit.java | 6 ++++++ .../LoanBeCollectionRecordService.java | 2 ++ .../loanbeoverdueveh/LoanBeOverdueVehMapper.xml | 2 ++ .../AppBeCollectionRecordVehInit.java | 16 ++++++++++------ .../risk/becollection/BeCollectionService.java | 8 +++++--- 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java index bda8056d8b..a6b3d234cf 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java @@ -21,8 +21,14 @@ public class LoanBeCollectionRecordVehInit { private String custPhone; @ApiModelProperty("客户及电话") private String custNameAndPhone; + @ApiModelProperty("实际还款人") + private String reaRepaymentName; + @ApiModelProperty("实际还款人电话") + private String reaRepaymentPhone; @ApiModelProperty("实际还款人及电话") private String reaRepaymentNameAndPhone; + @ApiModelProperty("贷款人") + private String loanName; @ApiModelProperty("贷款合同编号") private String loanContractNo; @ApiModelProperty("资方") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java index a3b1336111..c3853d7e97 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java @@ -204,6 +204,8 @@ public class LoanBeCollectionRecordService extends MybatisBaseService Date: Wed, 3 Jan 2024 17:43:33 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E6=96=87=E6=A1=A3=EF=BC=8C=E5=82=AC=E6=94=B6=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=B7=BB=E5=8A=A0=E7=9A=84=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=AF=B9=E7=A7=BB=E5=8A=A8=E5=92=8C?= =?UTF-8?q?PC=E7=9A=84=E4=BF=9D=E5=AD=98=E5=82=AC=E6=94=B6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=80=BB=E8=BE=91=E5=81=9A=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=8E=A7=E5=88=B6=E7=8A=B6=E6=80=81=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBeCollectionApplyFeign.java | 9 +++- .../LoanBeCollectionApplyFeignFallback.java | 5 +++ .../LoanBeCollectionRecordDto.java | 4 +- .../LoanBeCollectionApplyMapper.java | 24 ++++++----- .../LoanBeCollectionApplyRest.java | 7 +++ .../LoanBeCollectionApplyService.java | 21 ++++++--- .../LoanBeCollectionRecordService.java | 6 +-- .../LoanBeCollectionVehMapper.java | 8 ++-- .../LoanBeCollectionVehService.java | 4 ++ .../AppBeCollectionRecordDto.java | 4 +- .../AppBeCollectionRecordInit.java | 43 +++++++++++++++++++ .../AppBeCollectionRecordVehInit.java | 7 ++- .../risk/becollection/AppBeOverdueVehVo.java | 2 + .../becollection/BeCollectionService.java | 26 +++++++++-- 14 files changed, 134 insertions(+), 36 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeign.java index 91359a0210..8f33f537ce 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeign.java @@ -70,7 +70,7 @@ public interface LoanBeCollectionApplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody LoanBeCollectionApplyDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody @@ -79,13 +79,18 @@ public interface LoanBeCollectionApplyFeign { @ApiOperation("初始化") @GetMapping("/init") @ResponseBody - public ResultBean init(@RequestParam("saleVehSid") String saleVehSid,@RequestParam("orgPath") String orgPath,@RequestParam("userSid") String userSid); + public ResultBean init(@RequestParam("saleVehSid") String saleVehSid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("保存控制状态") + @PostMapping("/saveLockCarState") + @ResponseBody + public ResultBean saveLockCarState(@RequestParam("applySid") String applySid, @RequestParam("saleVehSid") String saleVehSid, @RequestParam("lockCarState") String lockCarState); + @ApiOperation("提交审批流程") @PostMapping("/submit") public ResultBean submit(@RequestBody @Valid SubmitLoanBeCollectionApplyDto dto); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeignFallback.java index 7089e14f5d..d960861edc 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeignFallback.java @@ -77,6 +77,11 @@ public class LoanBeCollectionApplyFeignFallback implements LoanBeCollectionApply return rb.setMsg("接口anrui-riskcenter/loanbecollectionapply/fetchDetailsBySid无法访问"); } + @Override + public ResultBean saveLockCarState(String applySid, String saleVehSid, String lockCarState) { + return null; + } + @Override public ResultBean submit(SubmitLoanBeCollectionApplyDto dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordDto.java index 54cdf5655f..fc061c19a9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordDto.java @@ -98,8 +98,8 @@ public class LoanBeCollectionRecordDto implements Dto { private String useOrgName; // 分公司名称 @ApiModelProperty("组织全路径") private String orgPath; // 组织全路径 - @ApiModelProperty("销售订单车辆sid") - private List saleVehSids; // 销售订单车辆sid @ApiModelProperty("催收附件") private List loanBeCollectionRecordFileList = new ArrayList<>(); // 催收附件 + @ApiModelProperty("逾期车辆列表") + private List loanBeCollectionRecordVehInitList; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java index 0081b67554..11523f43cf 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java @@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApply; import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo; +import org.apache.ibatis.annotations.Update; import java.util.List; import java.util.Map; @@ -54,17 +55,20 @@ import java.util.Map; @Mapper public interface LoanBeCollectionApplyMapper extends BaseMapper { - //@Update("update loan_be_collection_apply set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from loan_be_collection_apply") - List selectListVo(); + //@Update("update loan_be_collection_apply set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - String selectNum(String billNo); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from loan_be_collection_apply") + List selectListVo(); + + String selectNum(String billNo); int updateFlowFiled(Map map); + + @Update("update loan_be_collection_veh set lockCarState = #{lockCarState} where mainSid = #{applySid} and saleVehSid = #{saleVehSid}") + void saveLockCarState(@Param("applySid") String applySid, @Param("saleVehSid") String saleVehSid, @Param("lockCarState") String lockCarState); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java index 5b23138bc5..fdb71c2744 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java @@ -110,6 +110,13 @@ public class LoanBeCollectionApplyRest implements LoanBeCollectionApplyFeign { return rb.success().setData(vo); } + @Override + public ResultBean saveLockCarState(String applySid, String saleVehSid, String lockCarState) { + ResultBean rb = ResultBean.fireFail(); + loanBeCollectionApplyService.saveLockCarState(applySid,saleVehSid,lockCarState); + return rb.success(); + } + @Override public ResultBean submit(SubmitLoanBeCollectionApplyDto dto) { return loanBeCollectionApplyService.submit(dto); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java index d6b2836231..2fdd71c7a1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java @@ -236,7 +236,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService 0){ + if (files != null && files.size() > 0) { for (LoanBeCollectionFileVo file : files) { LoanFile loanFile = new LoanFile(); loanFile.setLinkSid(sid); @@ -253,7 +253,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService hkxyFiles = loanBeCollectionVehDetail.getHkxyFiles(); - if (hkxyFiles != null && hkxyFiles.size() > 0){ + if (hkxyFiles != null && hkxyFiles.size() > 0) { for (LoanBeCollectionFileVo hkxyFile : hkxyFiles) { LoanFile loanFile = new LoanFile(); loanFile.setLinkSid(vehSid); @@ -270,8 +270,8 @@ public class LoanBeCollectionApplyService extends MybatisBaseService 0){ + loanFileService.delByLinkSidOrType(dtoSid, LoanFileEnum.BECOLLECTIONAPPLY.getAttachType()); + if (files != null && files.size() > 0) { for (LoanBeCollectionFileVo file : files) { LoanFile loanFile = new LoanFile(); loanFile.setLinkSid(dtoSid); @@ -290,7 +290,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService hkxyFiles = loanBeCollectionVehDetail.getHkxyFiles(); - if (hkxyFiles != null && hkxyFiles.size() > 0){ + if (hkxyFiles != null && hkxyFiles.size() > 0) { for (LoanBeCollectionFileVo hkxyFile : hkxyFiles) { LoanFile loanFile = new LoanFile(); loanFile.setLinkSid(sid); @@ -347,7 +347,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService loanFiles = loanFileService.selectByLinkSid(sid, LoanFileEnum.BECOLLECTIONAPPLY.getAttachType()); List loanBeCollectionFileVos = new ArrayList<>(); - if (loanFiles != null && loanFiles.size() > 0){ + if (loanFiles != null && loanFiles.size() > 0) { for (LoanFile loanFile : loanFiles) { LoanBeCollectionFileVo loanBeCollectionFileVo = new LoanBeCollectionFileVo(); String filePath = loanFile.getFilePath(); @@ -362,7 +362,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService loanFiles1 = loanFileService.selectByLinkSid(loanBeCollectionVehDetailsVo.getSid(), LoanFileEnum.BECOLLECTIONVEHHKXY.getAttachType()); List loanBeCollectionFileVos1 = new ArrayList<>(); - if (loanFiles1 != null && loanFiles1.size() > 0){ + if (loanFiles1 != null && loanFiles1.size() > 0) { for (LoanFile file : loanFiles1) { LoanBeCollectionFileVo loanBeCollectionFileVo = new LoanBeCollectionFileVo(); String filePath = file.getFilePath(); @@ -722,6 +722,9 @@ public class LoanBeCollectionApplyService extends MybatisBaseService map) { return baseMapper.updateFlowFiled(map); } + + public void saveLockCarState(String applySid, String saleVehSid, String lockCarState) { + baseMapper.saveLockCarState(applySid, saleVehSid, lockCarState); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java index c3853d7e97..60f05d6456 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java @@ -123,15 +123,15 @@ public class LoanBeCollectionRecordService extends MybatisBaseService loanBeCollectionRecordFileList = dto.getLoanBeCollectionRecordFileList(); - List saleVehSids = dto.getSaleVehSids(); + List loanBeCollectionRecordVehInitList = dto.getLoanBeCollectionRecordVehInitList(); if (StringUtils.isBlank(dtoSid)) { - for (String saleVehSid : saleVehSids) { + for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInitList) { String orgPath = dto.getOrgPath(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); dto.setUseOrgName(sysOrganizationVo.getName()); dto.setUseOrgSid(useOrgSid); - dto.setSaleVehSid(saleVehSid); + dto.setSaleVehSid(loanBeCollectionRecordVehInit.getSaleVehSid()); String sid = this.insertByDto(dto); if (loanBeCollectionRecordFileList.size() > 0){ for (LoanBeCollectionRecordFile loanBeCollectionRecordFile : loanBeCollectionRecordFileList) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java index d3741cef31..5781aeaa11 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java @@ -30,10 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.*; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVeh; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo; @@ -70,4 +67,7 @@ public interface LoanBeCollectionVehMapper extends BaseMapper selByMainSid(String sid); + + @Update("update loan_be_collection_veh set lockCarState = '待控制' where mainSid = #{businessSid}") + void updateByMainSid(String businessSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java index 469ba2cb8c..d74ef310a0 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java @@ -250,4 +250,8 @@ public class LoanBeCollectionVehService extends MybatisBaseService appBeCollectionRecordVehInitList; @ApiModelProperty("催收附件") private List files = new ArrayList<>(); - @ApiModelProperty("销售订单车辆sid") - private List saleVehSids; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordInit.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordInit.java index aed26b1fe8..f08bf6a0e0 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordInit.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordInit.java @@ -3,6 +3,7 @@ package com.yxt.anrui.terminal.api.risk.becollection; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -18,4 +19,46 @@ public class AppBeCollectionRecordInit { private String spouseMobile; @ApiModelProperty("逾期车辆列表") private List appBeCollectionRecordVehInitList; + + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("催收方式key") + private String collectionTypeKey; + @ApiModelProperty("催收方式value") + private String collectionTypeValue; + @ApiModelProperty("定位坐标") + private String location; + @ApiModelProperty("定位具体位置") + private String locationStr; + @ApiModelProperty("催收结果key") + private String collectionResultKey; + @ApiModelProperty("催收结果value") + private String collectionResultValue; + @ApiModelProperty("联系人key") + private String contactsKey; + @ApiModelProperty("联系人value") + private String contactsValue; + @ApiModelProperty("逾期原因") + private String beReason; + @ApiModelProperty("是否正常运营key") + private String isNormalOperKey; + @ApiModelProperty("是否正常运营value") + private String isNormalOperValue; + @ApiModelProperty("承诺还款日期") + private String promRepayDate; + @ApiModelProperty("承诺还款金额") + private String promRepayMoney; + @ApiModelProperty("预处理措施key") + private String taskHandMeasuresKey; + @ApiModelProperty("预处理措施value") + private String taskHandMeasuresValue; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("催收附件") + private List files = new ArrayList<>(); + + @ApiModelProperty("协议书模板下载地址") + private String xysDownLoadUrl = "D:\\anrui\\upload\\template\\协议书模板.pdf"; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordVehInit.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordVehInit.java index 758b6849f0..7490c6100f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordVehInit.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordVehInit.java @@ -1,6 +1,7 @@ package com.yxt.anrui.terminal.api.risk.becollection; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,6 +10,8 @@ import java.util.Date; @Data public class AppBeCollectionRecordVehInit { + @ApiModelProperty("销售订单车辆sid") + private String vinSid; @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("车牌号") @@ -41,8 +44,8 @@ public class AppBeCollectionRecordVehInit { private String kpglSid; @ApiModelProperty("月还明细sid") private String yhmxSid; - @ApiModelProperty("金融方案sid") - private String jrfaSid; @ApiModelProperty("家访考察sid") private String jfkcSid; + @ApiModelProperty("金融方案详情页面") + private AppLoanHomeVisitVo jrfa; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeOverdueVehVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeOverdueVehVo.java index ac3d518fe9..858bc98622 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeOverdueVehVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeOverdueVehVo.java @@ -38,4 +38,6 @@ public class AppBeOverdueVehVo implements Vo { private String riskStaffUserName; @ApiModelProperty("远程控制状态") private String lockCarState; + @ApiModelProperty("是否显示催收日期") + private Boolean showCs = false; } 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 e5d3b819ea..55fcee94cd 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 @@ -433,6 +433,9 @@ public class BeCollectionService { appBeOverdueVehVo.setBeOverdueMoney(record.getBeOverdueMoney()); appBeOverdueVehVo.setBeOverdueMoneyAndPeriod(record.getBeOverdueMoneyAndPeriod()); appBeOverdueVehVo.setCreateTime(record.getCreateTime()); + if (record.getCreateTime() != null){ + appBeOverdueVehVo.setShowCs(true); + } appBeOverdueVehVo.setRiskStaffUserName(record.getRiskStaffUserName()); appBeOverdueVehVo.setLockCarState(record.getLockCarState()); appBeOverdueVehVoList.add(appBeOverdueVehVo); @@ -466,6 +469,7 @@ public class BeCollectionService { List appBeCollectionRecordVehInits = new ArrayList<>(); for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInitList) { AppBeCollectionRecordVehInit appBeCollectionRecordVehInit = new AppBeCollectionRecordVehInit(); + appBeCollectionRecordVehInit.setVinSid(loanBeCollectionRecordVehInit.getSaleVehSid()); appBeCollectionRecordVehInit.setVinNo(loanBeCollectionRecordVehInit.getVinNo()); appBeCollectionRecordVehInit.setCarNum(loanBeCollectionRecordVehInit.getCarNum()); appBeCollectionRecordVehInit.setCusName(loanBeCollectionRecordVehInit.getCustName()); @@ -481,18 +485,25 @@ public class BeCollectionService { appBeCollectionRecordVehInit.setCsjlSid(loanBeCollectionRecordVehInit.getSaleVehSid()); List sids = loanBeCollectionRecordVehInit.getSids(); for (LoanBeCollectionVehFile loanBeCollectionVehFile : sids) { + if ("催收记录".equals(loanBeCollectionVehFile.getName())) { + appBeCollectionRecordVehInit.setCsjlSid(loanBeCollectionVehFile.getSid()); + } if ("开票信息".equals(loanBeCollectionVehFile.getName())){ appBeCollectionRecordVehInit.setKpglSid(loanBeCollectionVehFile.getSid()); } if ("月还明细".equals(loanBeCollectionVehFile.getName())){ appBeCollectionRecordVehInit.setYhmxSid(loanBeCollectionVehFile.getSid()); } - if ("金融方案".equals(loanBeCollectionVehFile.getName())){ - appBeCollectionRecordVehInit.setJrfaSid(loanBeCollectionVehFile.getSid()); - } if ("家访考察报告".equals(loanBeCollectionVehFile.getName())){ appBeCollectionRecordVehInit.setJfkcSid(loanBeCollectionVehFile.getSid()); } + if ("金融方案".equals(loanBeCollectionVehFile.getName())) { + LoanSolutions loanSolutions = loanSolutionsFeign.fetchBySid(loanBeCollectionVehFile.getSid()).getData(); + CarModelVo finPage1 = commonService.getLoanSolution(loanSolutions.getSalesOrderSid()).getData(); + AppLoanHomeVisitVo finPage2 = new AppLoanHomeVisitVo(); + BeanUtil.copyProperties(finPage1, finPage2); + appBeCollectionRecordVehInit.setJrfa(finPage2); + } } appBeCollectionRecordVehInits.add(appBeCollectionRecordVehInit); } @@ -526,7 +537,6 @@ public class BeCollectionService { loanBeCollectionRecordDto.setTaskHandMeasuresKey(dto.getTaskHandMeasuresKey()); loanBeCollectionRecordDto.setTaskHandMeasuresValue(dto.getTaskHandMeasuresValue()); loanBeCollectionRecordDto.setOrgPath(dto.getOrgPath()); - loanBeCollectionRecordDto.setSaleVehSids(dto.getSaleVehSids()); List files = dto.getFiles(); List loanBeCollectionRecordFiles = new ArrayList<>(); if (files != null && files.size() > 0) { @@ -537,6 +547,14 @@ public class BeCollectionService { } } loanBeCollectionRecordDto.setLoanBeCollectionRecordFileList(loanBeCollectionRecordFiles); + List appBeCollectionRecordVehInitList = dto.getAppBeCollectionRecordVehInitList(); + List loanBeCollectionRecordVehInits = new ArrayList<>(); + for (AppBeCollectionRecordVehInit appBeCollectionRecordVehInit : appBeCollectionRecordVehInitList) { + LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit = new LoanBeCollectionRecordVehInit(); + loanBeCollectionRecordVehInit.setSaleVehSid(appBeCollectionRecordVehInit.getVinSid()); + loanBeCollectionRecordVehInits.add(loanBeCollectionRecordVehInit); + } + loanBeCollectionRecordDto.setLoanBeCollectionRecordVehInitList(loanBeCollectionRecordVehInits); loanBeCollectionRecordFeign.save(loanBeCollectionRecordDto); return rb.success(); } From d8e7ff19027e67563a7d82c0bd53d065f66ee653 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 3 Jan 2024 17:44:02 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=BD=AC=E4=BB=98=E6=8E=A8=E4=BB=A3?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=88=97=E8=A1=A8=E3=80=81=E8=BF=98=E6=AC=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=83=85=E5=86=B5=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinManufacturerBankFeign.java | 4 + .../FinManufacturerBankFeignFallback.java | 5 + .../FinManufacturerBankMapper.java | 2 + .../FinManufacturerBankMapper.xml | 6 + .../FinManufacturerBankRest.java | 5 + .../FinManufacturerBankService.java | 6 + .../LoanRepaymentPlanDetails.java | 12 +- .../LoanTransferPaymentRecord.java | 4 +- .../LoanRepaymentHistoryMapper.java | 2 + .../LoanRepaymentHistoryMapper.xml | 23 ++- .../LoanRepaymentHistoryService.java | 167 ++++++++---------- .../LoanRepaymentPlanDetailsMapper.java | 3 + .../LoanRepaymentPlanDetailsMapper.xml | 124 ++++++------- .../LoanRepaymentPlanDetailsService.java | 4 + .../LoanTransferPaymentApplyService.java | 128 +++++++++++++- .../LoanTransferPaymentRecordMapper.xml | 6 +- 16 files changed, 325 insertions(+), 176 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java index 1cd2519ec8..01782862c4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java @@ -102,4 +102,8 @@ public interface FinManufacturerBankFeign { @ResponseBody public ResultBean listByPayment(@RequestParam("orgPath") String orgPath, @RequestParam("key") String key); + @ApiOperation("根据账号获取银行账户信息") + @GetMapping("/selOneByBankNo") + @ResponseBody + public ResultBean selOneByBankNo(@RequestParam("bankAccount") String bankAccount, @RequestParam("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java index b5ce5cbb12..02c7648740 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java @@ -94,4 +94,9 @@ public class FinManufacturerBankFeignFallback implements FinManufacturerBankFeig public ResultBean listByPayment(String orgPath, String key) { return null; } + + @Override + public ResultBean selOneByBankNo(String bankAccount,String useOrgSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java index 29a55b3922..3566d5082b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java @@ -68,4 +68,6 @@ public interface FinManufacturerBankMapper extends BaseMapper selAppAccountByOrgSid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); List listByPayment(@Param("useOrgSid") String useOrgSid, @Param("key") String key); + + FinManufacturerBank selOneByBankNo(@Param("bankAccount") String bankAccount, @Param("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml index 5599f7927a..4fc519eeee 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml @@ -93,4 +93,10 @@ where useOrgSid = #{useOrgSid} and dueBankKey = #{key} + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java index 5e2dbe14ed..689d46b87b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java @@ -110,4 +110,9 @@ public class FinManufacturerBankRest implements FinManufacturerBankFeign { public ResultBean listByPayment(String orgPath, String key) { return finManufacturerBankService.listByPayment(orgPath,key); } + + @Override + public ResultBean selOneByBankNo(String bankAccount,String useOrgSid) { + return finManufacturerBankService.selOneByBankNo(bankAccount,useOrgSid); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java index 0aefac0f50..082056866d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java @@ -272,4 +272,10 @@ public class FinManufacturerBankService extends MybatisBaseService list = baseMapper.listByPayment(useOrgSid, key); return rb.success().setData(list); } + + public ResultBean selOneByBankNo(String bankAccount,String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + FinManufacturerBank finManufacturerBank = baseMapper.selOneByBankNo(bankAccount,useOrgSid); + return rb.success().setData(finManufacturerBank); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java index a3f99343c0..69a4af6eeb 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java @@ -70,11 +70,13 @@ public class LoanRepaymentPlanDetails extends BaseEntity { private String orgSidPath; - private String returnWayKey; + private String returnWayKey; //还款方式key（01直还、02间还、03转付） private String returnWay; - private String actualPerson; - private BigDecimal paymentMoney; - private BigDecimal fund; - + private String actualPerson; //实际还款人 + private BigDecimal paymentMoney; //公司垫款金额 + private BigDecimal fund; //资金占用费 + private Integer overdue; //是否曾逾期（0是，1否） + private Integer oweState; //是否转累欠状态（0是，1否） + private Date updateTime; //更新日期 } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java index 7451c2bc60..aeaf75bb19 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentrecord/LoanTransferPaymentRecord.java @@ -37,6 +37,6 @@ public class LoanTransferPaymentRecord extends BaseEntity { private String account; @ApiModelProperty("转付账户账号") private String accountNumber; - - + @ApiModelProperty("资方合同号") + private String bankContractNo; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java index c72bba9f50..6f434b8eab 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.java @@ -49,4 +49,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper repaymentDetailsList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List repaymentStatisticsExport(@Param(Constants.WRAPPER) QueryWrapper qw); + + String getMaxUpdateTimeByBankName(@Param("bankName") String bankName); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index 58f8c8650f..87b34fdfa8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -198,6 +198,8 @@ t.repaidMoney, t.outstandingMoney, v.bankBeInter, + pd.overdue as dueOverdue, + pd.updateTime as updateDate, CASE WHEN t.repaidMoney = 0 THEN '01' @@ -223,18 +225,14 @@ AND h.updateState = '1'),0) as repaidMoney , IFNULL( - p.dueMoney - ( - SELECT - SUM( - IFNULL( h.actualMoney, 0 )) + (p.dueMoney - IFNULL((SELECT + SUM(IFNULL( h.actualMoney, 0 )) FROM loan_repayment_history AS h WHERE h.planDetailSid = p.sid AND h.updateState = '1' - ), - 0 - ) AS outstandingMoney + ),0)),0) AS outstandingMoney FROM loan_repayment_plan_details AS p ) AS t ON pd.sid = t.sid @@ -352,5 +350,16 @@ ${ew.sqlSegment} + \ No newline at end of file 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 91b051ea2d..db134ffb8c 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 @@ -8,6 +8,8 @@ import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceImportReturn; import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceImportVo; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempExportVo; +import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank; +import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; @@ -21,6 +23,7 @@ import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.*; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto; +import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord; import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -491,7 +494,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService= date_format('" + dueStartDate + "','%Y-%m-%d')"). @@ -701,6 +704,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService qw = new QueryWrapper<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //======================= String orgSidPath = orgPath; orgSidPath = orgSidPath + "/"; @@ -714,6 +718,9 @@ public class LoanRepaymentHistoryService extends MybatisBaseService histories = baseMapper.selUpdateStateList(qw); + HashSet bankNames = new HashSet<>(); + HashSet pSids = new HashSet<>(); + String useOrgSid = ""; if (!histories.isEmpty()) { for (String historySid : histories) { LoanRepaymentHistory repaymentHistory = fetchBySid(historySid); @@ -721,6 +728,41 @@ public class LoanRepaymentHistoryService extends MybatisBaseService map = new HashMap<>(); + if (!bankNames.isEmpty()) { + for (String bankName : bankNames) { + String updateTime = baseMapper.getMaxUpdateTimeByBankName(bankName); + if (StringUtils.isNotBlank(updateTime)) { + map.put(bankName, updateTime); + } + } + } + if (!map.isEmpty()) { + for (Map.Entry entry : map.entrySet()) { + String updateTime = entry.getValue(); + try { + Date u = sdf.parse(updateTime); + Date today = new Date(); + String f = sdf.format(today); + Date date = sdf.parse(f); + if (u.compareTo(date) == 0) { + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(date); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + u = cal_1.getTime(); + } + int i = loanRepaymentPlanDetailsService.updateTime(entry.getKey(), u, useOrgSid); + } catch (ParseException e) { + e.printStackTrace(); + } } } } else { @@ -747,7 +789,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService histories = baseMapper.selbuckleNewInitList(qw); Set planSids = new HashSet<>(); if (!histories.isEmpty()) { @@ -963,11 +1005,19 @@ public class LoanRepaymentHistoryService extends MybatisBaseService= date_format('" + dueStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(dueEndDate), "date_format (a.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')" ); + String updateStartDate = pagerQuery.getUpdateStartDate(); + String updateEndDate = pagerQuery.getUpdateEndDate(); + qw.apply(StringUtils.isNotEmpty(updateStartDate), "date_format (a.updateDate,'%Y-%m-%d') >= date_format('" + updateStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(updateEndDate), "date_format (a.updateDate,'%Y-%m-%d') <= date_format('" + updateEndDate + "','%Y-%m-%d')" + ); qw.eq("1", "1"); qw.orderBy(true, true, "a.useOrgName") .orderBy(true, true, "a.vinNo") @@ -978,55 +1028,34 @@ public class LoanRepaymentHistoryService extends MybatisBaseService updateTimes = baseMapper.selnewUpdateTimeByPlanSid(sid); - updateTimes.removeAll(Collections.singleton(null)); - if (!updateTimes.isEmpty()) { - String updateTime = updateTimes.get(0); + if (StringUtils.isNotBlank(record.getUpdateDate())) { try { - Date updateTimeParse = sdf.parse(updateTime); - Date dueDateParse = sdf.parse(record.getDueDate()); - String format = sdf.format(new Date()); - Date parseNewDate = sdf.parse(format); - if (updateTimeParse.compareTo(dueDateParse) > 0) { - record.setNowOverdue("0"); - } else { - record.setNowOverdue("1"); - } - if (updateTimeParse.compareTo(parseNewDate) == 0) { - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.add(Calendar.DAY_OF_MONTH, -1); - record.setUpdateDate(sdf.format(cal_1.getTime())); - } else { - record.setUpdateDate(sdf.format(updateTimeParse)); - } - for (String time : updateTimes) { - Date parseTime = sdf.parse(time); - if (parseTime.compareTo(dueDateParse) > 0) { - record.setDueOverdue("0"); + Date u = sdf.parse(record.getUpdateDate()); + Date d = sdf.parse(record.getDueDate()); + if (d.compareTo(u) <= 0) { + BigDecimal sum = new BigDecimal(2); + if (StringUtils.isNotBlank(record.getOutstandingMoney())) { + sum = new BigDecimal(record.getOutstandingMoney()); + } + if (StringUtils.isNotBlank(record.getFund())) { + sum = sum.add(new BigDecimal(record.getFund())); + } + if (StringUtils.isNotBlank(record.getBankBeInter())) { + sum = sum.add(new BigDecimal(record.getBankBeInter())); + } + if (sum.compareTo(BigDecimal.ZERO) > 0) { + record.setNowOverdue("0"); + } else { + record.setNowOverdue("1"); } - } - if (StringUtils.isBlank(record.getDueOverdue())) { - record.setDueOverdue("1"); - } - } catch (ParseException e) { - e.printStackTrace(); - } - } else { - String format = sdf.format(new Date()); - try { - Date parseNewDate = sdf.parse(format); - Date dueDateParse = sdf.parse(record.getDueDate()); - if (parseNewDate.compareTo(dueDateParse) > 0) { - record.setNowOverdue("0"); - record.setDueOverdue("0"); } else { record.setNowOverdue("1"); - record.setDueOverdue("1"); } } catch (ParseException e) { e.printStackTrace(); } + } else { + record.setNowOverdue("1"); } } } @@ -1034,58 +1063,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService r.getNowOverdue().equals(pagerQuery.getNowOverdue())) .collect(Collectors.toList()); } - if (StringUtils.isNotBlank(pagerQuery.getDueOverdue())) { - records = records.stream().filter(r -> r.getDueOverdue().equals(pagerQuery.getDueOverdue())) - .collect(Collectors.toList()); - } - if (StringUtils.isNotBlank(pagerQuery.getUpdateStartDate()) || StringUtils.isNotBlank(pagerQuery.getUpdateEndDate())) { - records = records.stream().filter(new Predicate() { - @Override - public boolean test(RepaymentStatisticsVo v) { - if (StringUtils.isNotBlank(v.getUpdateDate())) { - if (StringUtils.isNotBlank(pagerQuery.getUpdateStartDate()) && StringUtils.isBlank(pagerQuery.getUpdateEndDate())) { - String updateStartDate = pagerQuery.getUpdateStartDate(); - try { - Date parseUpdateTime = sdf.parse(v.getUpdateDate()); - Date startTime = sdf.parse(updateStartDate); - if (parseUpdateTime.compareTo(startTime) >= 0) { - return true; - } - } catch (ParseException e) { - e.printStackTrace(); - } - } else if (StringUtils.isBlank(pagerQuery.getUpdateStartDate()) && StringUtils.isNotBlank(pagerQuery.getUpdateEndDate())) { - String updateEndDate = pagerQuery.getUpdateEndDate(); - try { - Date parseUpdateTime = sdf.parse(v.getUpdateDate()); - Date endTime = sdf.parse(updateEndDate); - if (parseUpdateTime.compareTo(endTime) <= 0) { - return true; - } - } catch (ParseException e) { - e.printStackTrace(); - } - } else { - String updateStartDate = pagerQuery.getUpdateStartDate(); - String updateEndDate = pagerQuery.getUpdateEndDate(); - try { - Date parseUpdateTime = sdf.parse(v.getUpdateDate()); - Date endTime = sdf.parse(updateEndDate); - Date startTime = sdf.parse(updateStartDate); - if (parseUpdateTime.compareTo(endTime) <= 0 && parseUpdateTime.compareTo(startTime) >= 0) { - return true; - } - } catch (ParseException e) { - e.printStackTrace(); - } - } - } - return false; - } - }).collect(Collectors.toList()); - } - - if (!records.isEmpty()) { List lastList = this.pageBySubList(records, (int) pq.getSize(), (int) pq.getCurrent()); pagerVo.setRecords(lastList); 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 e716f8d0e2..130debd400 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 @@ -14,6 +14,7 @@ import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformatio import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; @@ -37,4 +38,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper periodDetails(String saleVehSid); List planList(); + + int updateTime(@Param("bankName")String bankName,@Param("updateTime") Date updateTime,@Param("useOrgSid") String useOrgSid); } 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 68be48cb66..369dd3a5d0 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 @@ -1,6 +1,12 @@ + + UPDATE loan_repayment_plan_details + SET updateTime = #{updateTime} + WHERE bankName = #{bankName} + and useOrgSid = #{useOrgSid}; + DELETE FROM loan_repayment_plan_details @@ -12,16 +18,16 @@ from loan_repayment_plan_details where bankContractNo = #{bankContractNo} and `period` = #{period} - -- and policyOrOther = '0' + -- and policyOrOther = '0' \ No newline at end of file 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 4447b7b5ce..c7942fcc11 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 @@ -111,4 +111,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService planList() { return baseMapper.planList(); } + + public int updateTime(String bankName, Date updateTime,String useOrgSid) { + return baseMapper.updateTime(bankName,updateTime,useOrgSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java index 5c4cf98d63..3b3c932a75 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java @@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loantransferpaymentapply; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.math.Money; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,6 +10,10 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; +import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank; +import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeign; +import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; +import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -48,6 +53,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowableQuery; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -57,6 +63,7 @@ import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; +import java.util.function.Predicate; import java.util.stream.Collectors; /** @@ -89,6 +96,10 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService paymentInit(String[] sids) { ResultBean rb = ResultBean.fireFail(); @@ -585,6 +596,10 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService loanTransferPaymentRecords = loanTransferPaymentRecordService.selByMainSid(businessSid); if (!loanTransferPaymentRecords.isEmpty()) { + String payFormKey = apply.getPayFormKey(); //01按资方合同编号单笔付款/02按收款账号合并付款 + //按照合同号合并付款 + Map map = new HashMap<>(); + Set setConOrNumber = new HashSet<>(); for (LoanTransferPaymentRecord applyRecord : loanTransferPaymentRecords) { LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid()); if (null != repaymentHistory) { @@ -602,11 +617,116 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService collect = loanTransferPaymentRecords.stream().filter(new Predicate() { + @Override + public boolean test(LoanTransferPaymentRecord r) { + if (payFormKey.equals("01")) { + if (StringUtils.isNotBlank(r.getBankContractNo())) { + if (c.equals(r.getBankContractNo())) { + return true; + } + } + } else if (payFormKey.equals("02")) { + if (StringUtils.isNotBlank(r.getAccountNumber())) { + if (c.equals(r.getAccountNumber())) { + return true; + } + } + } + return false; + } + }).collect(Collectors.toList()); + for (LoanTransferPaymentRecord p : collect) { + BigDecimal a = new BigDecimal(0); + BigDecimal b = new BigDecimal(0); + if (null != p.getTransferPrincipal()) { + a = p.getTransferPrincipal(); + } + if (null != p.getDefaultInterest()) { + b = p.getDefaultInterest(); + } + decimal = a.add(b).add(decimal); + } + map.put(c, decimal); + } + if (!map.isEmpty()) { + for (Map.Entry entry : map.entrySet()) { + FinPaymentrecordDto payDto = new FinPaymentrecordDto(); + payDto.setBusSid(apply.getSid()); + payDto.setCreateBySid(apply.getCreateBySid()); + payDto.setCost(entry.getValue().intValue()); + payDto.setAccountsReceive(entry.getValue().intValue()); + payDto.setCostTitleKey("008"); + payDto.setCostTitleValue("月还"); + payDto.setCostTypeKey("006"); + payDto.setCostTypeValue("月还代收"); + if (StringUtils.isNotBlank(apply.getPayRemarks())) { + payDto.setBusRemarks(apply.getPayRemarks()); + } + payDto.setUseOrgSid(apply.getUseOrgSid()); + payDto.setCreateOrgSid(apply.getUseOrgSid()); + List collect = loanTransferPaymentRecords.stream().filter(new Predicate() { + @Override + public boolean test(LoanTransferPaymentRecord r) { + if (payFormKey.equals("01")) { + if (StringUtils.isNotBlank(r.getBankContractNo())) { + if (entry.getKey().equals(r.getBankContractNo())) { + return true; + } + } + } else if (payFormKey.equals("02")) { + if (StringUtils.isNotBlank(r.getAccountNumber())) { + if (entry.getKey().equals(r.getAccountNumber())) { + return true; + } + } + } + return false; + } + }).collect(Collectors.toList()); + if (!collect.isEmpty()) { + LoanTransferPaymentRecord paymentRecord = collect.get(0); + if (StringUtils.isNotBlank(paymentRecord.getAccountNumber())) { + payDto.setReceiveBankAccount(paymentRecord.getAccountNumber()); + FinManufacturerBank bank = finManufacturerBankFeign.selOneByBankNo(paymentRecord.getAccountNumber(), apply.getUseOrgSid()).getData(); + if (null != bank) { + if (StringUtils.isNotBlank(bank.getDepositBank())) { + payDto.setReceiveBank(bank.getDepositBank()); + } + } + } + if (StringUtils.isNotBlank(paymentRecord.getAccount())) { + payDto.setReceiveCompany(paymentRecord.getAccount()); + } + } + finPaymentrecordFeign.save(payDto); + } } } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml index ef8dbb2cd9..7719f0f720 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml @@ -10,9 +10,9 @@