From 84c6131d681b2f948758e7e6c99c5444515644f1 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 23 Mar 2023 10:41:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=94=B3=E8=AF=B7=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E9=A9=B3=E5=9B=9E=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 208 +++--------------- ...UncollectedReceivablesDetailedService.java | 4 +- 2 files changed, 33 insertions(+), 179 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 dbf8a40373..400140d322 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 @@ -33,8 +33,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; -import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate; -import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.base.api.commoncontract.CommonContract; @@ -363,7 +361,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds(); - BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); if (subscriptionMoneyAll.compareTo(new BigDecimal(dto.getCollectionMoney())) != 0) { return rb.setMsg("认款总额与收款金额不符"); @@ -375,11 +372,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { - return rb.setMsg("认款金额不允许大于当前应收金额"); - } } - } //对收款申请进行赋值操作 FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation(); @@ -395,7 +388,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds(); - - List paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); - if (paymentVoucherAppendixs.size() == 0) { - return rb.setMsg("请上传打款凭证附件"); - } - List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); - if (remittanceConfirmationAppendixs.size() == 0) { - return rb.setMsg("请上传汇款确认书附件"); - } - //款项申请主表sid - String sid = finCollectionConfirmation.getSid(); - BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid"); -// finCollectionConfirmation.setSid(sid1); - String payFilePath = ""; - String remFilePath = ""; - //用户sid - String createBySid = dto.getUserSid(); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData(); - finCollectionConfirmation.setCreateBySid(createBySid); - finCollectionConfirmation.setUseOrgSid(useOrgSid); - //附件进行保存 - for (FinCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) { - CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); - BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto); - String s = commonAppendixDto.getFilePath(); - if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - s = s.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(sid); - commonAppendixDto.setFilePath(s); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - } - payFilePath += s + ","; - } - finCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1)); - for (FinCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) { - CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); - BeanUtil.copyProperties(remittanceConfirmationAppendix, commonAppendixDto); - String s = commonAppendixDto.getFilePath(); - if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - s = s.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(sid); - commonAppendixDto.setFilePath(s); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - } - remFilePath += s + ","; } - finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1)); - for (FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto : finSelectedReceivablesDetailedDtos) { - //已选 - FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed(); - BeanUtil.copyProperties(finSelectedReceivablesDetailedDto, finSelectedReceivablesDetailed); - //主表sid - finSelectedReceivablesDetailed.setCollSid(sid); - //设置审核状态为待审核 - finSelectedReceivablesDetailed.setAuditState(1); - finSelectedReceivablesDetailed.setUseOrgSid(useOrgSid); - finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed); - //添加已选车架号为临时状态 - BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto(); - baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()); - baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks()); - baseVehicleTempstateDto.setTempKey("1"); - baseVehicleTempstateDto.setTempValue("待审核"); - baseVehicleTempstateDto.setBusSid(sid); - //根据合同编号和车架号查询该合同的车辆sid - ResultBean resultBean = busSalesOrderFeign.getVinSidByConSid(finSelectedReceivablesDetailedDto.getContractNo(), finSelectedReceivablesDetailedDto.getVIN()); - if (resultBean.getSuccess()) { - baseVehicleTempstateDto.setVehSid(resultBean.getData()); - } - ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto); - //已选应收款项-车架号 - String vin = finSelectedReceivablesDetailed.getVIN(); - //已选应收款项-应收项目名称 - String receivablesName = finSelectedReceivablesDetailed.getReceivablesName(); - FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); - //应收未收款项-当前应收金额 - BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney()); - //已选应收款项-认款金额 - BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney(); - if (subscriptionMoney == null) { - return rb.setMsg("请输入认款金额"); - } - BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney); - if (subtract.compareTo(BigDecimal.ZERO) < 0) { - return rb.setMsg("认款金额超出应收金额，请重新输入"); - } - finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract)); - FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); - BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto); - finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid()); - } - List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); - BigDecimal totalSubscriptionMone = new BigDecimal(0); - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { - BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); - totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney); - } - //收款金额 - BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); - BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone); - if (subtract.compareTo(BigDecimal.ZERO) < 0) { - return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对"); - } - finCollectionConfirmation.setBalance(collectionMoney); - FinCollectionConfirmation confirmation = fetchBySid(dto.getSid()); - if (confirmation == null) { - finCollectionConfirmation.setBalance(collectionMoney); - } else { - finCollectionConfirmation.setBalance(confirmation.getBalance()); - } - - finCollectionConfirmation.setAuditState(1); - finCollectionConfirmation.setPaymentState(1); - save(finCollectionConfirmation);*/ return rb.success().setMsg("添加成功"); } @@ -1133,7 +1008,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService> baseVehicleTempstateFeignList = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()); + /*ResultBean> baseVehicleTempstateFeignList = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()); List baseVehicleTempstates = baseVehicleTempstateFeignList.getData(); if (baseVehicleTempstates.size() > 0) { List stringList = baseVehicleTempstates.stream().map(v -> v.getBusSid()).distinct().collect(Collectors.toList()); @@ -1213,14 +1092,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService> resultBeanNew = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()); + /* ResultBean> resultBeanNew = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()); List list = resultBeanNew.getData(); if (list.size() > 0) { List stringList = list.stream().map(v -> v.getBusSid()).distinct().collect(Collectors.toList()); @@ -1233,8 +1112,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName()); + }*/ List collList = finSelectedReceivablesDetailedService.getPaymentList(qw, params.getName()); if (collList.isEmpty()) { collList = finSelectedReceivablesDetailedService.getPaymentList(qw, ""); @@ -1331,6 +1209,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState); - for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { - //更新审核时间 - finSelectedReceivablesDetailedService.updateAuditDateBySid(finSelectedReceivablesDetailedVo.getSid(), "2"); - String vin = finSelectedReceivablesDetailedVo.getVIN(); - String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName(); - BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); - FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); - String sid1 = finUncollectedReceivablesDetailedVo.getSid(); - BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney()); - String curRecMoney = String.valueOf(currentReceivableMoney.add(subscriptionMoney)); - finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1); - } - FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); - BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); - finCollectionConfirmation.setBalance(collectionMoney); - FinCollectionConfirmationDto finCollectionConfirmationDto = new FinCollectionConfirmationDto(); - BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDto); - updateBySid(finCollectionConfirmationDto, finCollectionConfirmationDto.getSid()); - //删除临时表的数据 - ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);*/ return rb.success().setMsg("驳回成功"); } @@ -1818,7 +1677,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()); + /*ResultBean> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()); List list = resultBean.getData(); if (list.size() > 0) { List stringList = list.stream().map(v -> v.getBusSid()).distinct().collect(Collectors.toList()); @@ -122,7 +122,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService qw.notIn("sid", strings); } } - } + }*/ if (StringUtils.isNotBlank(query.getContractNo())) { qw.like("contractNo", query.getContractNo()); }