From 4170fdf9da3d58c3a1dcf00fe1a98d6deea80826 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 4 Sep 2024 17:54:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=93=E6=B8=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=94=9F=E6=88=90=E5=BA=94=E6=94=B6=E3=80=81=E5=87=8F?= =?UTF-8?q?=E5=85=8D=E7=BB=93=E8=BD=AC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinSelectedReceivablesDetailedFeign.java | 4 + ...ectedReceivablesDetailedFeignFallback.java | 7 +- .../kingdee/voucher/CollectionVoucher.java | 2 + .../FinCollectionConfirmationService.java | 501 ++++-------------- .../FinSelectedReceivablesDetailedRest.java | 7 + .../LoanSettleApplyMapper.java | 6 + .../loansettleapply/LoanSettleApplyMapper.xml | 19 + .../LoanSettleApplyService.java | 419 +++++++-------- 8 files changed, 324 insertions(+), 641 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java index f02ecc1cd5..e18bb86378 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java @@ -96,4 +96,8 @@ public interface FinSelectedReceivablesDetailedFeign { @ApiOperation("根据维修工单sid查询待审核和已审核的认款金额之和") @GetMapping("/selRkByBillSid") ResultBean selRkByBillSid(@RequestParam("billSid") String billSid); + + @ApiOperation("删除") + @PostMapping("/delByList") + void delByList(@RequestBody List list); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java index 1edf946c66..dc120be4b7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java @@ -99,4 +99,9 @@ public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedR return null; } -} \ No newline at end of file + @Override + public void delByList(List list) { + + } + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java index 79649a7404..0fabec535e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/CollectionVoucher.java @@ -46,5 +46,7 @@ public class CollectionVoucher { public BigDecimal amount; @ApiModelProperty("备注") public String remarks; + @ApiModelProperty("差额适用于结清时计算差额") + public BigDecimal balance; } } 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 d4fca866f3..5ab41fe6f2 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 @@ -215,6 +215,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -3909,7 +3910,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid()); - stringList.removeAll(Collections.singleton(null)); - BigDecimal a3 = BigDecimal.ZERO; - if (!stringList.isEmpty()) { - a3 = baseMapper.selectA3(stringList); - } - unall = unall.add(a1).add(a3); - List unList = baseMapper.selectUnA(busVinSid); - unList.removeAll(Collections.singleton(null)); - BigDecimal a4 = BigDecimal.ZERO; - if (!unList.isEmpty()) { - //已收 - a4 = baseMapper.selectA4(unList); - } - BigDecimal a5 = BigDecimal.ZERO; - if (!stringList.isEmpty()) { - a5 = baseMapper.selectA5(stringList); - } - - yAll = yAll.add(a4).add(a5); - } - - } else { - LoanRepaymentPlanDetails loanRepaymentPlanDetails = baseMapper.selectByBss(finUncollectedReceivablesDetailedJR.getBusSid()); - if (loanRepaymentPlanDetails != null) { - busVinSid = loanRepaymentPlanDetails.getBusVinSid(); - List stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid()); - stringList.removeAll(Collections.singleton(null)); - BigDecimal a3 = BigDecimal.ZERO; - if (!stringList.isEmpty()) { - a3 = baseMapper.selectA3(stringList); - } - BigDecimal a1 = baseMapper.selectA1(busVinSid); - unall = unall.add(a1).add(a3); - List unList = baseMapper.selectUnA(busVinSid); - //已收 - unList.removeAll(Collections.singleton(null)); - BigDecimal a4 = BigDecimal.ZERO; - if (!unList.isEmpty()) { - //已收 - a4 = baseMapper.selectA4(unList); - } - BigDecimal a5 = BigDecimal.ZERO; - if (!stringList.isEmpty()) { - a5 = baseMapper.selectA5(stringList); - } - yAll = yAll.add(a4).add(a5); - } - } - if (yAll.compareTo(unall) >= 0) { - LoanSettleApply loanSettleApply = baseMapper.selectApply(busVinSid); - LoanSettleBankCost loanSettleBankCost = baseMapper.selectMainSid(loanSettleApply.getSid()); - LoanFinBank loanFinBank = baseMapper.selectByBanks(loanSettleApply.getSaleOrderSid()); - //推送出纳付款 - FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto(); - finPaymentrecordDto.setApplySid(""); - finPaymentrecordDto.setPayCompanySid(""); - finPaymentrecordDto.setPayType(1); - finPaymentrecordDto.setCreateOrgSid(loanSettleApply.getUseOrgSid()); - finPaymentrecordDto.setUseOrgSid(loanSettleApply.getUseOrgSid()); - /*finPaymentrecordDto.setCostTypeKey("007"); - finPaymentrecordDto.setCostTypeValue("垫款"); - finPaymentrecordDto.setCostTitleKey("008");*/ - finPaymentrecordDto.setCostTitleValue("资方结清款"); - /* if(loanFinBank != null){ - finPaymentrecordDto.setReceiveBank(loanFinBank.getBankCollectionAcc()); - finPaymentrecordDto.setReceiveBankAccount(loanFinBank.getBankCollectionNum()); - }*/ - - finPaymentrecordDto.setReceiveCompany(""); - finPaymentrecordDto.setCost(loanSettleBankCost.getBankSettlePrice().toString()); - finPaymentrecordDto.setAccountsReceive(loanSettleBankCost.getBankSettlePrice().toString()); - finPaymentrecordDto.setBusSid(loanSettleApply.getSid()); - finPaymentrecordDto.setPayCode(""); - finPaymentrecordDto.setCreateBySid(loanSettleApply.getCreateBySid()); - finPaymentrecordDto.setUpdateBySid(loanSettleApply.getCreateBySid()); - finPaymentrecordDto.setRemarks(loanSettleApply.getRemarks()); - finPaymentrecordDto.setPurchaseSystemSid(""); - finPaymentrecordDto.setPurchaseSystemName(""); - finPaymentrecordService.saveDto(finPaymentrecordDto).getData(); - - } - - +// CollectionVoucher.CollectionVoucherDetail d = getBalanceMoneyVoucher(v, collectionDate); +// voucherDetails.add(d); } }); //查询该申请已认款金额总数 @@ -4221,6 +4127,95 @@ public class FinCollectionConfirmationService extends MybatisBaseService bdCustomers = new ArrayList<>(); +// BdCustomer bdCustomer = new BdCustomer(); +// bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo()); +// String salesOrderSid = planDetails.getSalesOrderSid(); +// BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData(); +// bdCustomer.setFShortName(salesOrder.getContractNo()); +// BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData(); +// bdCustomer.setTOrgIds(data.getOrgCode()); +// if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { +// String vinNo = busSalesOrderVehicle.getLinkNo(); +// if (vinNo.length() > 8) { +// linkNo = vinNo.substring(vinNo.length() - 8); +// } else { +// linkNo = busSalesOrderVehicle.getLinkNo(); +// } +// if (null != borrowerDetailsVo) { +// bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo); +// customerName = borrowerDetailsVo.getBorrowerName() + linkNo; +// } +// } else { +// if (null != borrowerDetailsVo) { +// bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo()); +// customerName = borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo(); +// } +// } +// // bdCustomers.add(bdCustomer); +// ResultBean resultBean = finKingDeeFeignRest.draftBdCustomer(bdCustomer); +// if (resultBean.getSuccess()) { +// customerNumber = bdCustomer.getFNumber(); +// } +// } else { +// customerNumber = busSalesOrderVehicle.getTemporaryNo(); +// if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) { +// String vinNo = busSalesOrderVehicle.getLinkNo(); +// if (vinNo.length() > 8) { +// linkNo = vinNo.substring(vinNo.length() - 8); +// } else { +// linkNo = busSalesOrderVehicle.getLinkNo(); +// } +// if (null != borrowerDetailsVo) { +// customerName = borrowerDetailsVo.getBorrowerName() + linkNo; +// } +// } else { +// if (null != borrowerDetailsVo) { +// customerName = borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo(); +// } +// } +// } +// voucherDetail.setCustomerCode(customerNumber); +// voucherDetail.setCustomerName(customerName); +// } +// try { +// voucherDetail.setDataTime(sdf.parse(collectionDate)); +// } catch (ParseException e) { +// e.printStackTrace(); +// } +// voucherDetail.setAmount(new BigDecimal(v.getSubscriptionMoney())); +// } +// return voucherDetail;ssss + //} + private CollectionVoucher.CollectionVoucherDetail getReturnBackMoneyVoucher(FinSelectedReceivablesDetailedVo v, String collectionDate) { String planSid = ""; CollectionVoucher.CollectionVoucherDetail voucherDetail = new CollectionVoucher.CollectionVoucherDetail(); @@ -4570,306 +4565,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1); -// if (finSelectedReceivablesDetailedVos.size() > 0) { -// FinCollectionConfirmation finalConfirmation = confirmation; -// finSelectedReceivablesDetailedVos.stream().forEach(v -> { -// //已选款项明细sid -// String selectSid = v.getSid(); -// FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid); -// //更新已选款项明细的审核状态1待审核/2已驳回/3已审核 -// finSelectedReceivablesDetailed.setAuditState(3); -// //更新审核时间 -// finSelectedReceivablesDetailed.setAuditDate(DateUtil.today()); -// finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed); -// //推送间还认款记录 -// if (v.getReceivablesName().equals("月还")) { -// LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); -// historyEntity.setPlanDetailSid(v.getReceivablesSid()); -// LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(v.getReceivablesSid()).getData(); -// if (null != planDetails) { -// historyEntity.setScheduleSid(planDetails.getScheduleSid()); -// historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); -// historyEntity.setUpdateTime(new DateTime()); -// historyEntity.setUpdateState("1"); -// historyEntity.setDataTime(new DateTime()); -// historyEntity.setBuckle("审核通过"); -// historyEntity.setBuckleKey("003"); -// historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); -// try { -// Date collDate = sdf.parse(finalConfirmation.getCollectionDate()); -// historyEntity.setActualDate(collDate); -// if (planDetails.getDueDate().compareTo(collDate) >= 0) { -// //未逾期 -// Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 -// cal_1.setTime(planDetails.getDueDate()); -// 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); -// } -// if (v.getReceivablesName().equals("资方退还垫款")) { -// pushReturnVoucher(v, sid); -// } -// //推送间还待转付列表 -// if (v.getReceivablesName().equals("月还") || v.getReceivablesName().equals("资方逾期利息")) { -// String planSid = ""; -// if (v.getReceivablesName().equals("月还")) { -// planSid = v.getReceivablesSid(); -// } else { -// FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(v.getReceivablesSid()); -// if (jr != null) { -// planSid = jr.getBusSid(); -// } -// } -// LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData(); -// if (null != planDetails) { -// if (v.getReceivablesName().equals("月还")) { -// if (null != planDetails.getPaymentMoney()) { -// if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) { -// BigDecimal paymentMoney = planDetails.getPaymentMoney(); -// String subscriptionMoney = v.getSubscriptionMoney(); -// BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); -// planDetails.setPaymentMoney(subtract); -// loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); -// String orderSid = planDetails.getSalesOrderSid(); -// ResultBean bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid); -// if (bankResultBean.getData() != null) { -// LoanFinBank loanFinBank = bankResultBean.getData(); -// if (null != loanFinBank.getReAdvances()) { -// if (loanFinBank.getReAdvances() == 1) { -// FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); -// jr.setCreateBySid(userSid); -// SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData(); -// jr.setCreateByName(userVo.getName()); -// jr.setBusSid(planSid); -// jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney())); -// jr.setReveivableMoney(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); -// } -// } -// } -// } -// } -// } -// if (v.getReceivablesName().equals("资方逾期利息")) { -// if (null != planDetails.getPaymentInterest()) { -// if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) { -// BigDecimal paymentInterest = planDetails.getPaymentInterest(); -// String subscriptionMoney = v.getSubscriptionMoney(); -// BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney)); -// planDetails.setPaymentInterest(subtract); -// BigDecimal paymentMoney = planDetails.getPaymentMoney(); -// BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); -// planDetails.setPaymentMoney(subtract2); -// loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); -// String orderSid = planDetails.getSalesOrderSid(); -// ResultBean bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid); -// if (bankResultBean.getData() != null) { -// LoanFinBank loanFinBank = bankResultBean.getData(); -// if (null != loanFinBank.getReAdvances()) { -// if (loanFinBank.getReAdvances() == 1) { -// FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); -// jr.setCreateBySid(userSid); -// SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData(); -// jr.setCreateByName(userVo.getName()); -// jr.setBusSid(planSid); -// jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney())); -// jr.setReveivableMoney(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); -// } -// } -// } -// } -// } -// } -// } -// //推送间还月还收款凭证 -// pushIndirectVoucher(v, sid); -// } -// //认资金占用费消减平台资金占用费 -// if (v.getReceivablesName().equals("资金占用费")) { -// //推送资金占用费计提凭证 -// pushFundVoucher(v, sid); -// //推送资金占用费出纳确认后 -// pushFeeVoucher(v, sid); -// } -// if ("月还".equals(v.getReceivablesName()) -// || "垫资方逾期利息".equals(v.getReceivablesName()) -// || "资金占用费".equals(v.getReceivablesName()) -// || "结清时资方逾期利息".equals(v.getReceivablesName()) -// || "资方逾期利息".equals(v.getReceivablesName()) -// || "名义价".equals(v.getReceivablesName()) -// || "合同违约金".equals(v.getReceivablesName()) -// || "其他费用".equals(v.getReceivablesName()) -// ) { -// BigDecimal unall = BigDecimal.ZERO;//应收 -// String busVinSid = ""; -// BigDecimal yAll = BigDecimal.ZERO; -// FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = finUncollectedReceivablesDetailedJRService.fetchBySid(v.getReceivablesSid()); -// if (finUncollectedReceivablesDetailedJR == null) { -// LoanRepaymentPlanDetails loanRepaymentPlanDetails = baseMapper.selectByBss(v.getReceivablesSid()); -// if (loanRepaymentPlanDetails != null) { -// busVinSid = loanRepaymentPlanDetails.getBusVinSid(); -// BigDecimal a1 = baseMapper.selectA1(busVinSid); -//// BigDecimal a2 = baseMapper.selectA2(busVinSid); -// List stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid()); -// stringList.removeAll(Collections.singleton(null)); -// BigDecimal a3 = BigDecimal.ZERO; -// if (!stringList.isEmpty()) { -// a3 = baseMapper.selectA3(stringList); -// } -// unall = unall.add(a1).add(a3); -// List unList = baseMapper.selectUnA(busVinSid); -// unList.removeAll(Collections.singleton(null)); -// BigDecimal a4 = BigDecimal.ZERO; -// if (!unList.isEmpty()) { -// //已收 -// a4 = baseMapper.selectA4(unList); -// } -// BigDecimal a5 = BigDecimal.ZERO; -// if (!stringList.isEmpty()) { -// a5 = baseMapper.selectA5(stringList); -// } -// -// yAll = yAll.add(a4).add(a5); -// } -// -// } else { -// LoanRepaymentPlanDetails loanRepaymentPlanDetails = baseMapper.selectByBss(finUncollectedReceivablesDetailedJR.getBusSid()); -// if (loanRepaymentPlanDetails != null) { -// busVinSid = loanRepaymentPlanDetails.getBusVinSid(); -// List stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid()); -// stringList.removeAll(Collections.singleton(null)); -// BigDecimal a3 = BigDecimal.ZERO; -// if (!stringList.isEmpty()) { -// a3 = baseMapper.selectA3(stringList); -// } -// BigDecimal a1 = baseMapper.selectA1(busVinSid); -// unall = unall.add(a1).add(a3); -// List unList = baseMapper.selectUnA(busVinSid); -// //已收 -// unList.removeAll(Collections.singleton(null)); -// BigDecimal a4 = BigDecimal.ZERO; -// if (!unList.isEmpty()) { -// //已收 -// a4 = baseMapper.selectA4(unList); -// } -// BigDecimal a5 = BigDecimal.ZERO; -// if (!stringList.isEmpty()) { -// a5 = baseMapper.selectA5(stringList); -// } -// yAll = yAll.add(a4).add(a5); -// } -// } -// if (yAll.compareTo(unall) >= 0) { -// LoanSettleApply loanSettleApply = baseMapper.selectApply(busVinSid); -// LoanSettleBankCost loanSettleBankCost = baseMapper.selectMainSid(loanSettleApply.getSid()); -// LoanFinBank loanFinBank = baseMapper.selectByBanks(loanSettleApply.getSaleOrderSid()); -// //推送出纳付款 -// FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto(); -// finPaymentrecordDto.setApplySid(""); -// finPaymentrecordDto.setPayCompanySid(""); -// finPaymentrecordDto.setPayType(1); -// finPaymentrecordDto.setCreateOrgSid(loanSettleApply.getUseOrgSid()); -// finPaymentrecordDto.setUseOrgSid(loanSettleApply.getUseOrgSid()); -// /*finPaymentrecordDto.setCostTypeKey("007"); -// finPaymentrecordDto.setCostTypeValue("垫款"); -// finPaymentrecordDto.setCostTitleKey("008");*/ -// finPaymentrecordDto.setCostTitleValue("资方结清款"); -// /* if(loanFinBank != null){ -// finPaymentrecordDto.setReceiveBank(loanFinBank.getBankCollectionAcc()); -// finPaymentrecordDto.setReceiveBankAccount(loanFinBank.getBankCollectionNum()); -// }*/ -// -// finPaymentrecordDto.setReceiveCompany(""); -// finPaymentrecordDto.setCost(loanSettleBankCost.getBankSettlePrice().toString()); -// finPaymentrecordDto.setAccountsReceive(loanSettleBankCost.getBankSettlePrice().toString()); -// finPaymentrecordDto.setBusSid(loanSettleApply.getSid()); -// finPaymentrecordDto.setPayCode(""); -// finPaymentrecordDto.setCreateBySid(loanSettleApply.getCreateBySid()); -// finPaymentrecordDto.setUpdateBySid(loanSettleApply.getCreateBySid()); -// finPaymentrecordDto.setRemarks(loanSettleApply.getRemarks()); -// finPaymentrecordDto.setPurchaseSystemSid(""); -// finPaymentrecordDto.setPurchaseSystemName(""); -// finPaymentrecordService.saveDto(finPaymentrecordDto).getData(); -// -// } -// -// -// } -// }); -// //查询该申请已认款金额总数 -// subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); -// } -// confirmation = fetchBySid(sid); -// //更新收款申请的余额以及审核状态 -// BigDecimal balanceBigDecimal = confirmation.getCollectionMoney().subtract(subscriptionMoneyAll); -// confirmation.setBalance(balanceBigDecimal); -// //查询当前登录人信息并更新审核人和审核时间 -// ResultBean userVoResultBean = sysUserFeign.fetchBySid(userSid); -// if (userVoResultBean.getData() != null) { -// confirmation.setConfirmName(userVoResultBean.getData().getName()); -// } -// confirmation.setConfirmDate(DateUtil.today()); -// confirmation.setConfirmNameSid(userSid); -// baseMapper.updateById(confirmation); -// return rb.success().setMsg("款项确认成功"); -// } - private void pushFundVoucher(FinSelectedReceivablesDetailedVo v, String sid) { String planSid = ""; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java index 1d27853f35..590caa57f8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java @@ -125,4 +125,11 @@ public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivable return finSelectedReceivablesDetailedService.selRkByBillSid(billSid); } + @Override + public void delByList(List list) { + for (FinSelectedReceivablesDetailed detailed : list) { + finSelectedReceivablesDetailedService.deleteBySid(detailed.getSid()); + } + } + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java index 8d14736a94..bf20ff25a9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java @@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; +import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply; import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyVo; @@ -76,4 +78,8 @@ public interface LoanSettleApplyMapper extends BaseMapper { void updatePaymentStateByBusVinSid(@Param("busVinSid") String busVinSid); int selectNum(String bill); + + List selJMSelectedByBusVinSid(@Param("busVinSid") String busVinSid); + + List selLoanHistories(@Param("busVinSid") String busVinSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml index 05f687b8db..9c3d6f965f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml @@ -352,4 +352,23 @@ FROM ( from loan_settle_apply where billNo LIKE concat(#{bill}, '%') + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java index 389ee8a67c..f41c6b2a89 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java @@ -173,6 +173,7 @@ public class LoanSettleApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanSettleApplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -379,6 +380,20 @@ public class LoanSettleApplyService extends MybatisBaseService list = baseMapper.selJMSelectedByBusVinSid(busVinSid); + if (null != list) { + if (!list.isEmpty() && list.size() > 0) { + finSelectedReceivablesDetailedFeign.delByList(list); + } + } + //资方划扣还款明细中存在结清车辆转付负数的还款记录时，不能发起结清申请。 + List histories = baseMapper.selLoanHistories(busVinSid); + if (null != histories) { + if (!histories.isEmpty() && histories.size() > 0) { + return rb.setMsg("请将结清车辆间还款项，在平台上操作完成转付资方数据更新后，再发起结清申请审批！"); + } + } //新增初始化 //根据用户查询发起人、发起部门、发起日期为当前日期 String deptName = ""; @@ -474,26 +489,7 @@ public class LoanSettleApplyService extends MybatisBaseService= 0) { - loanSettleApplyDetailsVo.setConfirmAtn(true); - } + loanSettleApplyDetailsVo.setConfirmAtn(true); } } } @@ -829,12 +825,12 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + //贷款保证金扣罚 + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setBusSid(planDetails.getSid()); + jr.setReveivableMoney(loanSettleCompanyCost.getDeductionAmount()); + jr.setPayCostTitleKey("013"); + 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()); + list.add(jr); + } + } + } list.removeAll(Collections.singleton(null)); updateList.removeAll(Collections.singleton(null)); if (!list.isEmpty() && list.size() > 0) { @@ -1012,6 +1036,7 @@ public class LoanSettleApplyService extends MybatisBaseService histories = new ArrayList<>();//还款记录 + List updatePsList = new ArrayList<>();//还款计划明细集合 List selectList = new ArrayList<>(); LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid()); String scheduleSid = planDetails.getScheduleSid(); @@ -1052,6 +1077,7 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { BigDecimal money = new BigDecimal(m.getMoney()); + BigDecimal mm = BigDecimal.ZERO; String sid = m.getSid(); String mSid = m.getMSid(); LoanRepaymentHistory history = new LoanRepaymentHistory(); @@ -1063,19 +1089,31 @@ public class LoanSettleApplyService extends MybatisBaseService= 0) { + mm = money; history.setActualMoney(money); histories.add(history); deposit = deposit.subtract(money); } else { + mm = deposit; history.setActualMoney(deposit); histories.add(history); deposit = BigDecimal.ZERO; } + LoanRepaymentPlanDetails details = loanRepaymentPlanDetailsService.fetchBySid(sid); + if (null != details) { + if (null != details.getPaymentMoney()) { + BigDecimal paymentMoney = details.getPaymentMoney(); + if (paymentMoney.compareTo(BigDecimal.ZERO) > 0) { + details.setPaymentMoney(paymentMoney.subtract(mm)); + updatePsList.add(details); + } + } + } } } } @@ -1088,17 +1126,20 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { BigDecimal money = new BigDecimal(m.getMoney()); + BigDecimal mm = BigDecimal.ZERO; String sid = m.getSid(); FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); fin.setCreateBySid(userSid); - fin.setRemarks("结转"); + fin.setRemarks("贷款保证金抵顶"); fin.setVIN(planDetails.getVinNo()); fin.setUseOrgSid(planDetails.getUseOrgSid()); fin.setReceivablesName("资方逾期利息"); if (deposit.compareTo(money) >= 0) { + mm = money; fin.setSubscriptionMoney(money); deposit = deposit.subtract(money); } else { + mm = deposit; fin.setSubscriptionMoney(deposit); deposit = BigDecimal.ZERO; } @@ -1110,6 +1151,18 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + details.setPaymentMoney(paymentMoney.subtract(mm)); + details.setPaymentInterest(paymentInterest.subtract(mm)); + updatePsList.add(details); + } + } + } } } } @@ -1120,7 +1173,7 @@ public class LoanSettleApplyService extends MybatisBaseService 0 && !selectList.isEmpty()) { ResultBean resultBean = finSelectedReceivablesDetailedFeign.saveAll(selectList); } + updatePsList.removeAll(Collections.singleton(null)); + if (!updatePsList.isEmpty() && updatePsList.size() > 0) { + loanRepaymentPlanDetailsService.updateList(updatePsList); + } } //--------------------------------- 减免 ---------------------------- @@ -1285,224 +1342,102 @@ public class LoanSettleApplyService extends MybatisBaseService p = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "006"); p.removeAll(Collections.singleton(null)); if (!p.isEmpty() && p.size() > 0) { for (PlanNoReturnMoney m : p) { - BigDecimal money = new BigDecimal(m.getMoney()); + if (fundJM.compareTo(BigDecimal.ZERO) > 0) { + BigDecimal money = new BigDecimal(m.getMoney()); + FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); + fin.setCreateBySid(userSid); + fin.setRemarks("结清减免"); + fin.setVIN(planDetails.getVinNo()); + fin.setUseOrgSid(planDetails.getUseOrgSid()); + fin.setReceivablesName("资金占用费"); + if (money.compareTo(fundJM) >= 0) { + fin.setSubscriptionMoney(fundJM); + } else { + fin.setSubscriptionMoney(money); + } + fin.setSubscriptionDate(DateUtil.today()); + fin.setAuditState(3); + fin.setAuditDate(DateUtil.today()); + fin.setReceivablesSid(m.getJrSid()); + fin.setKxState("01"); + fin.setUseOrgName(planDetails.getUseOrgName()); + fin.setOrgSidPath(loanSettleApply.getOrgSidPath()); + selectList.add(fin); + fundJM = fundJM.subtract(money); + } + } + } + //贷款保证金扣罚 + PlanNoReturnMoney p3 = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "贷款保证金扣罚"); + if (null != p3) { + if (depositJM.compareTo(BigDecimal.ZERO) > 0) { FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); - fin.setCreateBySid(userSid); - fin.setRemarks("减免"); + fin.setCreateBySid(planDetails.getSalesUserSid()); + fin.setRemarks("结清减免"); fin.setVIN(planDetails.getVinNo()); fin.setUseOrgSid(planDetails.getUseOrgSid()); - fin.setReceivablesName("资金占用费"); - fin.setSubscriptionMoney(money); + fin.setReceivablesName("贷款保证金扣罚"); + fin.setSubscriptionMoney(depositJM); fin.setSubscriptionDate(DateUtil.today()); fin.setAuditState(3); fin.setAuditDate(DateUtil.today()); - fin.setReceivablesSid(m.getJrSid()); + fin.setReceivablesSid(p3.getJrSid()); fin.setKxState("01"); + fin.setPurchaseSystemSid(""); + fin.setPurchaseSystemName(""); + fin.setStaffUserSid(""); fin.setUseOrgName(planDetails.getUseOrgName()); fin.setOrgSidPath(loanSettleApply.getOrgSidPath()); selectList.add(fin); } } - //月还 - List p1 = baseMapper.selPlansNoReturnMoneyByBusVinSidDesc(busVinSid); - p1.removeAll(Collections.singleton(null)); - if (!p1.isEmpty() && p1.size() > 0) { - for (PlanNoReturnMoney m : p1) { - BigDecimal money = new BigDecimal(m.getMoney()); - String sid = m.getSid(); - String mSid = m.getMSid(); - LoanRepaymentHistory history = new LoanRepaymentHistory(); - history.setCreateBySid(userSid); - history.setDataTime(new Date()); - history.setUpdateState("1"); - history.setUpdateTime(new Date()); - history.setActualDate(new Date()); - history.setBuckleKey("003"); - history.setBuckle("审核通过"); - history.setReturnWayKey("05"); - history.setReturnWay("减免"); - history.setPayState(0); - history.setPlanDetailSid(sid); - history.setScheduleSid(mSid); - history.setActualMoney(money); - histories.add(history); - } - } - //垫资方逾期利息 - List p2 = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "005"); - p2.removeAll(Collections.singleton(null)); - if (!p2.isEmpty() && p2.size() > 0) { - for (PlanNoReturnMoney m : p2) { - BigDecimal money = new BigDecimal(m.getMoney()); - String sid = m.getSid(); + //其他费用 + PlanNoReturnMoney p6 = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "其他费用"); + if (null != p6) { + if (otherJM.compareTo(BigDecimal.ZERO) > 0) { FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); - fin.setCreateBySid(userSid); - fin.setRemarks("减免"); + fin.setCreateBySid(planDetails.getSalesUserSid()); + fin.setRemarks("结清减免"); fin.setVIN(planDetails.getVinNo()); fin.setUseOrgSid(planDetails.getUseOrgSid()); - fin.setReceivablesName("资方逾期利息"); - fin.setSubscriptionMoney(money); + fin.setReceivablesName("其他费用"); + fin.setSubscriptionMoney(otherJM); fin.setSubscriptionDate(DateUtil.today()); fin.setAuditState(3); fin.setAuditDate(DateUtil.today()); - fin.setReceivablesSid(m.getJrSid()); + fin.setReceivablesSid(p6.getJrSid()); fin.setKxState("01"); + fin.setPurchaseSystemSid(""); + fin.setPurchaseSystemName(""); + fin.setStaffUserSid(""); fin.setUseOrgName(planDetails.getUseOrgName()); fin.setOrgSidPath(loanSettleApply.getOrgSidPath()); selectList.add(fin); } } - //资方逾期利息 - PlanNoReturnMoney p3 = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "结清时资方逾期利息"); - if (null != p3) { - BigDecimal money = new BigDecimal(p3.getMoney()); - FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); - fin.setCreateBySid(planDetails.getSalesUserSid()); - fin.setRemarks("减免"); - fin.setVIN(planDetails.getVinNo()); - fin.setUseOrgSid(planDetails.getUseOrgSid()); - fin.setReceivablesName("结清时资方逾期利息"); - fin.setSubscriptionMoney(money); - fin.setSubscriptionDate(DateUtil.today()); - fin.setAuditState(3); - fin.setAuditDate(DateUtil.today()); - fin.setReceivablesSid(p3.getJrSid()); - fin.setKxState("01"); - fin.setPurchaseSystemSid(""); - fin.setPurchaseSystemName(""); - fin.setStaffUserSid(""); - fin.setUseOrgName(planDetails.getUseOrgName()); - fin.setOrgSidPath(loanSettleApply.getOrgSidPath()); - selectList.add(fin); - } - //名义价 - PlanNoReturnMoney p4 = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "名义价"); - if (null != p4) { - BigDecimal money = new BigDecimal(p4.getMoney()); - FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); - fin.setCreateBySid(planDetails.getSalesUserSid()); - fin.setRemarks("减免"); - fin.setVIN(planDetails.getVinNo()); - fin.setUseOrgSid(planDetails.getUseOrgSid()); - fin.setReceivablesName("名义价"); - fin.setSubscriptionMoney(money); - fin.setSubscriptionDate(DateUtil.today()); - fin.setAuditState(3); - fin.setAuditDate(DateUtil.today()); - fin.setReceivablesSid(p4.getJrSid()); - fin.setKxState("01"); - fin.setPurchaseSystemSid(""); - fin.setPurchaseSystemName(""); - fin.setStaffUserSid(""); - fin.setUseOrgName(planDetails.getUseOrgName()); - fin.setOrgSidPath(loanSettleApply.getOrgSidPath()); - selectList.add(fin); - } - //合同违约金 - PlanNoReturnMoney p5 = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "合同违约金"); - if (null != p5) { - BigDecimal money = new BigDecimal(p5.getMoney()); - FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); - fin.setCreateBySid(planDetails.getSalesUserSid()); - fin.setRemarks("减免"); - fin.setVIN(planDetails.getVinNo()); - fin.setUseOrgSid(planDetails.getUseOrgSid()); - fin.setReceivablesName("合同违约金"); - fin.setSubscriptionMoney(money); - fin.setSubscriptionDate(DateUtil.today()); - fin.setAuditState(3); - fin.setAuditDate(DateUtil.today()); - fin.setReceivablesSid(p5.getJrSid()); - fin.setKxState("01"); - fin.setPurchaseSystemSid(""); - fin.setPurchaseSystemName(""); - fin.setStaffUserSid(""); - fin.setUseOrgName(planDetails.getUseOrgName()); - fin.setOrgSidPath(loanSettleApply.getOrgSidPath()); - selectList.add(fin); - } - //其他费用 - PlanNoReturnMoney p6 = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "其他费用"); - if (null != p6) { - BigDecimal money = new BigDecimal(p6.getMoney()); - FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); - fin.setCreateBySid(planDetails.getSalesUserSid()); - fin.setRemarks("减免"); - fin.setVIN(planDetails.getVinNo()); - fin.setUseOrgSid(planDetails.getUseOrgSid()); - fin.setReceivablesName("其他费用"); - fin.setSubscriptionMoney(money); - fin.setSubscriptionDate(DateUtil.today()); - fin.setAuditState(3); - fin.setAuditDate(DateUtil.today()); - fin.setReceivablesSid(p6.getJrSid()); - fin.setKxState("01"); - fin.setPurchaseSystemSid(""); - fin.setPurchaseSystemName(""); - fin.setStaffUserSid(""); - fin.setUseOrgName(planDetails.getUseOrgName()); - fin.setOrgSidPath(loanSettleApply.getOrgSidPath()); - selectList.add(fin); - } -// //资方退还垫款应收 -// List p7 = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "007"); -// p7.removeAll(Collections.singleton(null)); -// if (!p7.isEmpty() && p7.size() > 0) { -// for (PlanNoReturnMoney m : p7) { -// BigDecimal money = new BigDecimal(m.getMoney()); -// String sid = m.getSid(); -// LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid); -// FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed(); -// fin.setCreateBySid(userSid); -// fin.setRemarks("减免"); -// fin.setVIN(pd.getVinNo()); -// fin.setUseOrgSid(pd.getUseOrgSid()); -// fin.setReceivablesName("资方退还垫款"); -// fin.setSubscriptionMoney(money); -// fin.setSubscriptionDate(DateUtil.today()); -// fin.setAuditState(3); -// fin.setAuditDate(DateUtil.today()); -// fin.setReceivablesSid(m.getJrSid()); -// fin.setKxState("01"); -// fin.setUseOrgName(pd.getUseOrgName()); -// fin.setOrgSidPath(loanSettleApply.getOrgSidPath()); -// selectList.add(fin); -// } -// } - //对应的垫款金额、资方逾期利息设置0 - List ps = baseMapper.selectPlanListByBusVinSid(busVinSid); - ps.removeAll(Collections.singleton(null)); - Set set = new HashSet<>(); - if (!ps.isEmpty() && ps.size() > 0) { - for (LoanRepaymentPlanDetails pp : ps) { - if (pp.getPaymentMoney() != null) { - if (pp.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) { - - } else { - set.add(pp.getSid()); - } - } - if (pp.getPaymentInterest() != null) { - if (pp.getPaymentInterest().compareTo(BigDecimal.ZERO) == 0) { - - } else { - set.add(pp.getSid()); - } - } - } - } - List sids = new ArrayList<>(set); - if (!sids.isEmpty() && sids.size() > 0) { - loanRepaymentPlanDetailsService.updatePaymentMoneyBySids(sids); - } - if (histories.size() > 0 && !histories.isEmpty()) { - loanRepaymentHistoryService.saveList(histories); - } selectList.removeAll(Collections.singleton(null)); if (selectList.size() > 0 && !selectList.isEmpty()) { ResultBean resultBean = finSelectedReceivablesDetailedFeign.saveAll(selectList); @@ -1523,9 +1458,9 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { - return rb.setMsg("只能在结清申请发起当日确认客户结清，若需结清，请重新发起结清申请！"); + return rb.setMsg("只能在结清申请发起当日确认客户结清，若需结清，请将结清日期修改为当天，重新发起结清申请！"); } loanSettleApply.setState(1); baseMapper.updateById(loanSettleApply); carryForward(loanSettleApply); - reliefMoney(loanSettleApply); //更新车辆表结清状态 baseMapper.updateBus(loanSettleApply.getBusVinSid(), "1"); //推送资方结清款到出纳代付款列表 @@ -2514,14 +2448,25 @@ public class LoanSettleApplyService extends MybatisBaseService