From ddb91a9b821fe3595bb92cf6ac12f3093694d21e Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 23 Feb 2024 08:45:50 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinBillApplicationService.java | 348 +++++++++--------- 1 file changed, 173 insertions(+), 175 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index bb9c723088..8f23fd2049 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -688,210 +688,208 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicles = dto.getFinBillVehicles(); - BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid()); - BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid()); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(dto.getOpenTickSid()); - if (!dto.getOpenTickSid().equals(busSalesOrder.getAffiliatedCompanySid())) { - //生成开票申请书 - if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { - ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); - if (invoicingDetailsVoResultBean.getData() != null) { - map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + if("1".equals(busSalesOrder.getPayTypeKey()) || ("2".equals(busSalesOrder.getPayTypeKey()) && StringUtils.isNotBlank(loanSolutions.getTypeKey()))) { + List finBillVehicles = dto.getFinBillVehicles(); + BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid()); + BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(dto.getOpenTickSid()); + if (!dto.getOpenTickSid().equals(busSalesOrder.getAffiliatedCompanySid())) { + //生成开票申请书 + if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } } - } - map.put("contractNo", busSalesOrder.getContractNo()); - List list = new ArrayList<>(); + map.put("contractNo", busSalesOrder.getContractNo()); + List list = new ArrayList<>(); - BillFileVo billFileVo = new BillFileVo(); - if (busSalesOrderModel != null) { - billFileVo.setCarName(busSalesOrderModel.getModelName()); - billFileVo.setNum(String.valueOf(finBillVehicles.size())); - billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString()); - } - if (loanSolutions != null) { - if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) { - billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount()); + BillFileVo billFileVo = new BillFileVo(); + if (busSalesOrderModel != null) { + billFileVo.setCarName(busSalesOrderModel.getModelName()); + billFileVo.setNum(String.valueOf(finBillVehicles.size())); + billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString()); } - } - billFileVo.setType(busSalesOrder.getBillingType()); - list.add(billFileVo); - List finBillTrailers = dto.getFinBillTrailers(); - finBillTrailers.removeAll(Collections.singleton(null)); - Map carNameMap = new HashMap<>(); - if (!finBillTrailers.isEmpty()) { - for (int i = 0; i < finBillTrailers.size(); i++) { - FinBillTrailerDto finBillTrailerDto = finBillTrailers.get(i); - billFileVo = new BillFileVo(); - BaseTrailer baseTrailer = baseMapper.selectByTrailerNo(finBillTrailerDto.getGcVinNo()); - if (baseTrailer != null) { - BaseTrailerModel baseTrailerModel = baseMapper.selectByModelSid(baseTrailer.getTrailerModelSid()); - if (baseTrailerModel != null) { - String carName = "外廓-" + Integer.parseInt(baseTrailerModel.getAppearanceSizeLong()) / 1000 + "米" + "\t" + baseTrailerModel.getTrailerTypeValue(); - if (carNameMap.containsKey(carName)) { - carNameMap.put(carName, Integer.parseInt(carNameMap.get(carName).toString()) + 1); - continue; - } else { - billFileVo.setType(busSalesOrder.getBillingType()); - if (loanSolutions != null) { - if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) { - billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount()); + if (loanSolutions != null) { + if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) { + billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount()); + } + } + billFileVo.setType(busSalesOrder.getBillingType()); + list.add(billFileVo); + List finBillTrailers = dto.getFinBillTrailers(); + finBillTrailers.removeAll(Collections.singleton(null)); + Map carNameMap = new HashMap<>(); + if (!finBillTrailers.isEmpty()) { + for (int i = 0; i < finBillTrailers.size(); i++) { + FinBillTrailerDto finBillTrailerDto = finBillTrailers.get(i); + billFileVo = new BillFileVo(); + BaseTrailer baseTrailer = baseMapper.selectByTrailerNo(finBillTrailerDto.getGcVinNo()); + if (baseTrailer != null) { + BaseTrailerModel baseTrailerModel = baseMapper.selectByModelSid(baseTrailer.getTrailerModelSid()); + if (baseTrailerModel != null) { + String carName = "外廓-" + Integer.parseInt(baseTrailerModel.getAppearanceSizeLong()) / 1000 + "米" + "\t" + baseTrailerModel.getTrailerTypeValue(); + if (carNameMap.containsKey(carName)) { + carNameMap.put(carName, Integer.parseInt(carNameMap.get(carName).toString()) + 1); + continue; + } else { + billFileVo.setType(busSalesOrder.getBillingType()); + if (loanSolutions != null) { + if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) { + billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount()); + } } + billFileVo.setCarName(carName); + if (busSalesOrderModel != null) { + billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString()); + } + carNameMap.put(carName, 1); + list.add(billFileVo); } - billFileVo.setCarName(carName); - if (busSalesOrderModel != null) { - billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString()); - } - carNameMap.put(carName, 1); - list.add(billFileVo); } } } } - } - if (!list.isEmpty()) { - for (int i = 0; i < list.size(); i++) { - BillFileVo billFileVo1 = list.get(i); - String carName = billFileVo1.getCarName(); - if (carNameMap.containsKey(carName)) { - billFileVo1.setNum(carNameMap.get(carName).toString()); - } - } - } - map.put("list", list); - map.put("name",busSalesOrder.getAffiliatedCompany()); - String date = DateUtil.today(); - List dateString = Arrays.asList(date.split("-")); - String year = dateString.get(0); - String month = dateString.get(1); - String day = dateString.get(2); - map.put("year", year); - map.put("month", month); - map.put("day", day); - if (!"02".equals(dto.getOpenTickTypeKey())) { - if (finCompanyInvoicingDetailsVo != null) { - //生成车辆登记合同 - if (busSalesOrder != null) { - carMap.put("Yf", busSalesOrder.getCustomerName()); - carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称 - } - carMap.put("contractNo", "D" + map.get("contractNo")); - if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { - ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); - if (invoicingDetailsVoResultBean.getData() != null) { - carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + if (!list.isEmpty()) { + for (int i = 0; i < list.size(); i++) { + BillFileVo billFileVo1 = list.get(i); + String carName = billFileVo1.getCarName(); + if (carNameMap.containsKey(carName)) { + billFileVo1.setNum(carNameMap.get(carName).toString()); } } - carMap.put("date", date); - List carContractListVos = new ArrayList<>(); - - for (FinBillVehicleDto salesOrderVehicle : finBillVehicles) { - CarContractListVo carContractListVo = new CarContractListVo(); - BaseVehicle baseVehicle = baseMapper.selectByVinSid(salesOrderVehicle.getVehSid()); - carContractListVo.setBrand(baseVehicle.getModelName()); - carContractListVo.setVinNo(baseVehicle.getVinNo()); - carContractListVo.setEnginNo(baseVehicle.getEngineNo()); - carContractListVos.add(carContractListVo); - } - carMap.put("carLists", carContractListVos); - } - } - } - - if (loanSolutions != null) { - if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) { - String remarks = ""; + map.put("list", list); + map.put("name", busSalesOrder.getAffiliatedCompany()); String date = DateUtil.today(); List dateString = Arrays.asList(date.split("-")); String year = dateString.get(0); String month = dateString.get(1); String day = dateString.get(2); - filemap.put("year", year); - filemap.put("month", month); - filemap.put("day", day); - if (finCompanyInvoicingDetailsVo != null) { - filemap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称 - filemap.put("customerName", finCompanyInvoicingDetailsVo.getName());//开票名称 - filemap.put("invoiceNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号 - filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号 - filemap.put("adds", finCompanyInvoicingDetailsVo.getAddress());//户籍地址 - }else{ - CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(dto.getOpenTickSid()); - if (crmCustomerTemp != null) { - filemap.put("invoiceName", crmCustomerTemp.getName());//开票名称 - filemap.put("customerName", crmCustomerTemp.getName());//开票名称 - filemap.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号 - filemap.put("idNo", crmCustomerTemp.getIDNumber());//纳税人识别号 - filemap.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址 + map.put("year", year); + map.put("month", month); + map.put("day", day); + if (!"02".equals(dto.getOpenTickTypeKey())) { + if (finCompanyInvoicingDetailsVo != null) { + //生成车辆登记合同 + if (busSalesOrder != null) { + carMap.put("Yf", busSalesOrder.getCustomerName()); + carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称 + } + carMap.put("contractNo", "D" + map.get("contractNo")); + if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid()); + if (invoicingDetailsVoResultBean.getData() != null) { + carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName()); + } + } + carMap.put("date", date); + List carContractListVos = new ArrayList<>(); + + for (FinBillVehicleDto salesOrderVehicle : finBillVehicles) { + CarContractListVo carContractListVo = new CarContractListVo(); + BaseVehicle baseVehicle = baseMapper.selectByVinSid(salesOrderVehicle.getVehSid()); + carContractListVo.setBrand(baseVehicle.getModelName()); + carContractListVo.setVinNo(baseVehicle.getVinNo()); + carContractListVo.setEnginNo(baseVehicle.getEngineNo()); + carContractListVos.add(carContractListVo); + } + carMap.put("carLists", carContractListVos); + } } - filemap.put("invoiceType", dto.getOpenTickTypeValue());//开票类型 - remarks = "数量" + finBillVehicles.size() + "台，单台成交价： 元。"; - filemap.put("remarks", remarks); - filemap.put("busSid",busSalesOrder.getSid()); - ResultBean> mapResultBean = commonContractFeign.getModelMap(filemap); - checkMap = mapResultBean.getData(); - //生成新车空白合同 - checkMap.put("totalPrice", ""); - checkMap.put("priceRemarks", ""); - checkMap.put("depositTotal", ""); - checkMap.put("createOrgName", ""); + } + + if (loanSolutions != null) { + if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) { + String remarks = ""; + String date = DateUtil.today(); + List dateString = Arrays.asList(date.split("-")); + String year = dateString.get(0); + String month = dateString.get(1); + String day = dateString.get(2); + filemap.put("year", year); + filemap.put("month", month); + filemap.put("day", day); + if (finCompanyInvoicingDetailsVo != null) { + filemap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称 + filemap.put("customerName", finCompanyInvoicingDetailsVo.getName());//开票名称 + filemap.put("invoiceNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号 + filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号 + filemap.put("adds", finCompanyInvoicingDetailsVo.getAddress());//户籍地址 + } else { + CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(dto.getOpenTickSid()); + if (crmCustomerTemp != null) { + filemap.put("invoiceName", crmCustomerTemp.getName());//开票名称 + filemap.put("customerName", crmCustomerTemp.getName());//开票名称 + filemap.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + filemap.put("idNo", crmCustomerTemp.getIDNumber());//纳税人识别号 + filemap.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址 + } + } + filemap.put("invoiceType", dto.getOpenTickTypeValue());//开票类型 + remarks = "数量" + finBillVehicles.size() + "台，单台成交价： 元。"; + filemap.put("remarks", remarks); + filemap.put("busSid", busSalesOrder.getSid()); + ResultBean> mapResultBean = commonContractFeign.getModelMap(filemap); + checkMap = mapResultBean.getData(); + //生成新车空白合同 + checkMap.put("totalPrice", ""); + checkMap.put("priceRemarks", ""); + checkMap.put("depositTotal", ""); + checkMap.put("createOrgName", ""); - } - } - try { - ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() - .setNameFormat("demo-pool-%d").build(); - ExecutorService pool = new ThreadPoolExecutor(1, 2, - 1000, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - List filesList = new ArrayList<>(); - if(!map.isEmpty()){ - Future future1 = pool.submit(() -> { - return getInvoiceApplyFile(map); - }); - if (StringUtils.isNotBlank(future1.get())) { - File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get()); - filesList.add(file); } } - if(!carMap.isEmpty()){ - Future future2 = pool.submit(() -> { - return getCarFile(carMap); - }); - if (StringUtils.isNotBlank(future2.get())) { - File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get()); - filesList.add(file); + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(1, 2, + 1000, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + List filesList = new ArrayList<>(); + if (!map.isEmpty()) { + Future future1 = pool.submit(() -> { + return getInvoiceApplyFile(map); + }); + if (StringUtils.isNotBlank(future1.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get()); + filesList.add(file); + } } - } - Map finalCheckMap = checkMap; - if(!finalCheckMap.isEmpty()){ - Future future3 = pool.submit(() -> { - return blackFile(finalCheckMap); - }); - if (StringUtils.isNotBlank(future3.get())) { - File file = new File(docPdfComponent.getUploadTemplateUrl() + future3.get()); - filesList.add(file); + if (!carMap.isEmpty()) { + Future future2 = pool.submit(() -> { + return getCarFile(carMap); + }); + if (StringUtils.isNotBlank(future2.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get()); + filesList.add(file); + } + } + Map finalCheckMap = checkMap; + if (!finalCheckMap.isEmpty()) { + Future future3 = pool.submit(() -> { + return blackFile(finalCheckMap); + }); + if (StringUtils.isNotBlank(future3.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future3.get()); + filesList.add(file); + } } - } - - - + if (filesList.size() > 0) { + String typeName = contractNo + "开票附件.pdf"; + File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName); + System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName); + fileUrl = typeName; + } - if (filesList.size() > 0) { - String typeName = contractNo + "开票附件.pdf"; - File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName); - System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName); - fileUrl =typeName; + } catch (Exception e) { + e.printStackTrace(); + log.error("生成文件失败：==========================" + e.getMessage()); } - - } catch (Exception e) { - e.printStackTrace(); - log.error("生成文件失败：==========================" + e.getMessage()); } return fileUrl; From db21b5daff84ebe4ecf34ebecd170b78f22ae1d7 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 23 Feb 2024 14:59:35 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java index 93d1436a36..df4f74e76b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java @@ -54,7 +54,7 @@ public class ScheduledLoanFundDayService { //截止到当天垫款余额T BigDecimal paymentMoneyAll = list.get(i).getPaymentMoney(); //当天资金占用费B - BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal(7)).divide(new BigDecimal(10000), BigDecimal.ROUND_CEILING); + BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal(7)).divide(new BigDecimal(10000),2, BigDecimal.ROUND_CEILING); LoanRepaymentPlanDetails loanRepaymentPlanDetails = list.get(i); LoanFundDay loanFundDay = new LoanFundDay(); loanFundDay.setBusSid(loanRepaymentPlanDetails.getSid()); From 99816976cd7c1cdb35bb6da7d120466146d61a80 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 23 Feb 2024 15:30:34 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B6=88=E5=87=8F?= =?UTF-8?q?=E5=9E=AB=E6=AC=BE=E4=BD=99=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepaymentHistoryMapper.java | 2 ++ .../LoanRepaymentHistoryMapper.xml | 12 ++++++++++++ .../LoanRepaymentHistoryService.java | 10 +++++++--- 3 files changed, 21 insertions(+), 3 deletions(-) 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 88ae7f2ea7..afa5959052 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 @@ -53,4 +53,6 @@ public interface LoanRepaymentHistoryMapper extends BaseMapper histories); } 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 f8c2ace9d8..d97532c0ec 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 @@ -445,5 +445,17 @@ where r.repaymentHistorySid = #{sid} and r.state = 1 + \ 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 11a7945a44..a62f55b179 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 @@ -766,14 +766,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService 0) { + //查询更新金额 + String money = baseMapper.getUpdateMoneyBySid(pSid,histories); + BigDecimal decimalMoney = new BigDecimal(money); LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(pSid); - planDetails.setPaymentMoney(planDetails.getPaymentMoney().subtract(amount)); + BigDecimal paymentMoney = planDetails.getPaymentMoney(); + planDetails.setPaymentMoney(paymentMoney.subtract(decimalMoney)); loanRepaymentPlanDetailsService.updateById(planDetails); //生成平台资方退还垫款 FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); jr.setBusSid(planDetails.getSid()); - jr.setCurrentReceivableMoney(amount); - jr.setReveivableMoney(amount); + jr.setCurrentReceivableMoney(decimalMoney); + jr.setReveivableMoney(decimalMoney); jr.setPayCostTitleKey("007"); jr.setPayCostTitleValue("资方退还垫款"); jr.setOrgSidPath(planDetails.getOrgSidPath()); From 07f361a7ea2798f762b42b37c29f5a08188ddf28 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 23 Feb 2024 16:38:06 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=87=91=E8=9E=8D=E8=AE=A4=E6=AC=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 50 +++++++++++++++++-- ...ncollectedReceivablesDetailedJRMapper.java | 2 +- ...UncollectedReceivablesDetailedJRMapper.xml | 33 ++++++++---- ...collectedReceivablesDetailedJRService.java | 4 +- 4 files changed, 71 insertions(+), 18 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 19b84af7e4..f3aad57a06 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 @@ -3557,7 +3557,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); List rskList = new ArrayList<>(); if (!finSelectedReceivablesDetailedVos.isEmpty()) { - finSelectedReceivablesDetailedVos.stream().forEach(v -> { + for (FinSelectedReceivablesDetailedVo v : finSelectedReceivablesDetailedVos) { FinSelectedReceivablesDetailedRsk rsk = new FinSelectedReceivablesDetailedRsk(); String receivablesSid = v.getReceivablesSid(); if (v.getReceivablesName().equals("月还")) { @@ -3582,7 +3582,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService { +// FinSelectedReceivablesDetailedRsk rsk = new FinSelectedReceivablesDetailedRsk(); +// String receivablesSid = v.getReceivablesSid(); +// if (v.getReceivablesName().equals("月还")) { +// LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(receivablesSid).getData(); +// if (null != data) { +// BeanUtil.copyProperties(data, rsk, "sid"); +// if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) { +// rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark()); +// } +// String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyRsk(receivablesSid); +// if (StringUtils.isNotBlank(noReturnMoney)) { +// rsk.setNoReceivableMoney(noReturnMoney); +// } +// } +// } else { +// FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(receivablesSid); +// if (jr != null) { +// String busSid = jr.getBusSid(); +// LoanRepaymentPlanDetails data = loanRepaymentPlanDetailsFeign.fetchDetails(busSid).getData(); +// if (null != data) { +// BeanUtil.copyProperties(data, rsk, "sid"); +// if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) { +// rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark()); +// } +// String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid); +// if (StringUtils.isNotBlank(noReturnMoney)) { +// rsk.setNoReceivableMoney(noReturnMoney); +// } +// } +// } +// } +// rsk.setCurrentReceivableMoney(v.getCurrentReceivableMoney()); +// rsk.setReceivablesName(v.getReceivablesName()); +// rsk.setSid(v.getSid()); +// rsk.setSubscriptionMoney(v.getSubscriptionMoney()); +// rsk.setReceivablesSid(v.getReceivablesSid()); +// rsk.setAuditState(String.valueOf(v.getAuditState())); +// rskList.add(rsk); +// }); } finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetaileds(rskList); if (finCollectionConfirmation.getAuditState() == 2) { @@ -4550,7 +4590,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService getRskPaymentDetailsListForRule( @Param(Constants.WRAPPER) QueryWrapper qw, @Param("userOrgSid") String userOrgSid, diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml index b66e41dc1f..d7adf49b1c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml @@ -242,16 +242,29 @@ where p.sid = #{planSid}