diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index a60172c0b3..a198b6c575 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -2052,6 +2052,27 @@ public class CommonContractService extends MybatisBaseService future10 = pool.submit(() -> { + return getRisk(appOrderDetailsVo,dto); + }); + List filesList = new ArrayList<>(); + if (StringUtils.isNotBlank(future10.get())) { + File file = new File(docPdfComponent.getUploadTemplateUrl() + future10.get()); + filesList.add(file); + } + if (filesList.size() > 0) { + String typeName = appOrderDetailsVo.getPayType() + contractNo + ".pdf"; + File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName); + System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName); + urlAll = typeName; + } + if (StringUtils.isNotBlank(urlAll)) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", appOrderDetailsVo.getPayType() + contractNo)); + printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + urlAll); + list.add(printConfirmVo); + } } //生成合同数据 //根据销售订单sid查询合同表中是否存在 @@ -2143,100 +2164,6 @@ public class CommonContractService extends MybatisBaseService vinList = appOrderModelInfoVo.getVinListsVos(); - for (int i = 0; i < vinList.size(); i++) { - UnCollectionDto unCollectionDto = new UnCollectionDto(); - //合同sid - unCollectionDto.setContractSid(commonContract.getSid()); - //合同编号 - unCollectionDto.setContractNo(commonContract.getContractNo()); - //客户名称 - unCollectionDto.setCustomerName(appOrderDetailsVo.getName()); - //客户sid - unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid()); - //客户类型 - unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey()); - //客户类型 - unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType()); - //客户头像 - unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage()); - unCollectionDto.setReceivablesName("车款"); - unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone()); - unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid()); - unCollectionDto.setVinNo(vinList.get(i).getVinNo()); - unCollectionDto.setCurrentReceivableMoney(money); - unCollectionDto.setUserSid(dto.getUserSid()); - unCollectionDto.setReveivableMoney(money); - unCollectionDto.setBusVinSid(vinList.get(i).getSid()); - unCollectionDto.setPayType(appOrderDetailsVo.getPayType()); - unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey()); - unCollectionDto.setPurchaseSystemName(appOrderDetailsVo.getPurchaseSystemName()); - unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid()); - finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); - } - } - //添加推送至款项确认的应收未收明细中 - List vinList = appOrderModelInfoVo.getVinListsVos(); - //更新销售订单的临时号 - if("2".equals(appOrderDetailsVo.getPayTypeKey())){//贷款 - for(int i = 0; i < vinList.size(); i++){ - //销售订单中车辆表的sid - String salesOrderVinSid = vinList.get(i).getSid(); - String temporaryNum = String.format("%02d", i + 1); - String temporaryNo = commonContract.getContractNo()+temporaryNum; - //更新临时号 - ResultBean busSalesOrderResultBean = busSalesOrderVehicleFeign.updateTemporaryNo(salesOrderVinSid,temporaryNo); - } - } - //查询是否是结转金额,如果是,则订金金额为补交金额/台数。若为现金则为单台订金 - String key = depositInfo.getDepositTypeKey(); - BigDecimal bigDecimalKeyAll = new BigDecimal("0"); - if ("02".equals(key)) { - String makeUpAll = depositInfo.getMakeUpDeposit(); - if (makeUpAll != null) { - bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(makeUpAll).divide(new BigDecimal(num))); - } - } else { - bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(depositInfo.getDeposit())); - } - if (bigDecimalKeyAll.compareTo(BigDecimal.ZERO) != 0) { - for (int i = 0; i < vinList.size(); i++) { - UnCollectionDto unCollectionDto = new UnCollectionDto(); - //合同sid - unCollectionDto.setContractSid(commonContract.getSid()); - //合同编号 - unCollectionDto.setContractNo(commonContract.getContractNo()); - //客户名称 - unCollectionDto.setCustomerName(appOrderDetailsVo.getName()); - //客户sid - unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid()); - //客户类型 - unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey()); - //客户类型 - unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType()); - //客户头像 - unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage()); - unCollectionDto.setReceivablesName("订金"); - unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone()); - unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid()); - unCollectionDto.setVinNo(vinList.get(i).getVinNo()); - unCollectionDto.setCurrentReceivableMoney(bigDecimalKeyAll.toString()); - unCollectionDto.setUserSid(dto.getUserSid()); - unCollectionDto.setReveivableMoney(depositInfo.getDeposit()); - unCollectionDto.setBusVinSid(vinList.get(i).getSid()); - unCollectionDto.setPayType(appOrderDetailsVo.getPayType()); - unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey()); - unCollectionDto.setPurchaseSystemName(appOrderDetailsVo.getPurchaseSystemName()); - unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid()); - finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); - } - }*/ return commonContract.getSid(); }); } else { @@ -2276,9 +2203,9 @@ public class CommonContractService extends MybatisBaseService