From 8c20739e8c3188436f5befacf454242946bc8264 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 15 Apr 2022 11:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusCollectionConfirmationFeign.java | 6 +- .../BusSelectedReceivablesDetailedDto.java | 2 + .../BusCollectionConfirmationRest.java | 8 +- .../BusCollectionConfirmationService.java | 135 ++++++++---------- 4 files changed, 71 insertions(+), 80 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java index 04864cdca5..24e0dab6c8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java @@ -60,9 +60,9 @@ public interface BusCollectionConfirmationFeign { @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("新增或修改保存") - @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto); + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody BusCollectionConfirmationDto dto); @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java index 8b4a9eee4e..bba256a2df 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java @@ -69,6 +69,8 @@ public class BusSelectedReceivablesDetailedDto implements Dto { private String receivablesName; // 应收项目名称 @ApiModelProperty("当前应收金额") private String currentReceivableMoney; // 当前应收金额 + @ApiModelProperty("上次认款金额") + private String lastSubscriptionMoney; // 上次认款金额 @ApiModelProperty("认款金额") private String subscriptionMoney; // 认款金额 @ApiModelProperty("认款申请日期") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java index aa95acb0c7..53623f1f2c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java @@ -71,10 +71,10 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF } @Override - @ApiOperation("新增或修改保存") - @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto) { - return busCollectionConfirmationService.saveOrUpdateAllDto(dto); + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody BusCollectionConfirmationDto dto) { + return busCollectionConfirmationService.saveAllDto(dto); } @Override diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java index a7c992052d..4bc744b932 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java @@ -117,7 +117,7 @@ public class BusCollectionConfirmationService extends MybatisBaseService busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos(); @@ -126,86 +126,75 @@ public class BusCollectionConfirmationService extends MybatisBaseService remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); String sid1 = busCollectionConfirmation.getSid(); String sid = dto.getSid(); - if (StringUtils.isBlank(sid)) {//新增 - BeanUtil.copyProperties(dto, busCollectionConfirmation); - busCollectionConfirmation.setSid(sid1); - String payFilePath = ""; - String remFilePath = ""; - for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) { - BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto); - payFilePath = commonAppendixDto.getFilePath(); - if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(sid1); - commonAppendixDto.setFilePath(payFilePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - } - payFilePath += payFilePath + ","; + BeanUtil.copyProperties(dto, busCollectionConfirmation); + busCollectionConfirmation.setSid(sid1); + String payFilePath = ""; + String remFilePath = ""; + for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) { + BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto); + payFilePath = commonAppendixDto.getFilePath(); + if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setLinkSid(sid1); + commonAppendixDto.setFilePath(payFilePath); + commonAppendixDto.setCreateBySid(dto.getStaffSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); } - busCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1)); - for (BusCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) { - BeanUtil.copyProperties(remittanceConfirmationAppendix, commonAppendixDto); - remFilePath = commonAppendixDto.getFilePath(); - if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(sid1); - commonAppendixDto.setFilePath(remFilePath); - commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); - commonAppendixFeign.save(commonAppendixDto); - } - remFilePath += remFilePath + ","; - } - busCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1)); - for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) { - BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed(); - BeanUtil.copyProperties(busSelectedReceivablesDetailedDto, busSelectedReceivablesDetailed); - busSelectedReceivablesDetailed.setCollSid(sid1); - busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed); - //已选应收款项-车架号 - String vin = busSelectedReceivablesDetailed.getVIN(); - //已选应收款项-应收项目名称 - String receivablesName = busSelectedReceivablesDetailed.getReceivablesName(); - BusUncollectedReceivablesDetailedVo busUncollectedReceivablesDetailedVo = busUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); - //应收未收款项-当前应收金额 - BigDecimal currentReceivableMoney = new BigDecimal(busUncollectedReceivablesDetailedVo.getCurrentReceivableMoney()); - //已选应收款项-认款金额 - BigDecimal subscriptionMoney = busSelectedReceivablesDetailed.getSubscriptionMoney(); - BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney); - if (subtract.compareTo(BigDecimal.ZERO) < 0){ - return rb.setMsg("认款金额超出应收金额，请重新输入"); - } - busUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f",subtract)); - BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedDto = new BusUncollectedReceivablesDetailedDto(); - BeanUtil.copyProperties(busUncollectedReceivablesDetailedVo,busUncollectedReceivablesDetailedDto); - busUncollectedReceivablesDetailedService.updateBySid(busUncollectedReceivablesDetailedDto,busUncollectedReceivablesDetailedDto.getSid()); - } - List busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid1); - BigDecimal totalSubscriptionMone = null; - for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos) { - BigDecimal subscriptionMoney = new BigDecimal(busSelectedReceivablesDetailedVo.getSubscriptionMoney()); - totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney); - } - BigDecimal collectionMoney = busCollectionConfirmation.getCollectionMoney(); - BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone); - if (subtract.compareTo(BigDecimal.ZERO) < 0){ - return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对"); + payFilePath += payFilePath + ","; + } + busCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1)); + for (BusCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) { + BeanUtil.copyProperties(remittanceConfirmationAppendix, commonAppendixDto); + remFilePath = commonAppendixDto.getFilePath(); + if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setLinkSid(sid1); + commonAppendixDto.setFilePath(remFilePath); + commonAppendixDto.setCreateBySid(dto.getStaffSid()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); } - busCollectionConfirmation.setBalance(totalSubscriptionMone); - save(busCollectionConfirmation); - return rb.success().setMsg("添加成功"); + remFilePath += remFilePath + ","; } - updateBySid(dto, sid); - busSelectedReceivablesDetailedService.deleteByCollSid(sid); + busCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1)); for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) { BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed(); BeanUtil.copyProperties(busSelectedReceivablesDetailedDto, busSelectedReceivablesDetailed); - busSelectedReceivablesDetailed.setCollSid(sid); + busSelectedReceivablesDetailed.setCollSid(sid1); busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed); + //已选应收款项-车架号 + String vin = busSelectedReceivablesDetailed.getVIN(); + //已选应收款项-应收项目名称 + String receivablesName = busSelectedReceivablesDetailed.getReceivablesName(); + BusUncollectedReceivablesDetailedVo busUncollectedReceivablesDetailedVo = busUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); + //应收未收款项-当前应收金额 + BigDecimal currentReceivableMoney = new BigDecimal(busUncollectedReceivablesDetailedVo.getCurrentReceivableMoney()); + //已选应收款项-认款金额 + BigDecimal subscriptionMoney = busSelectedReceivablesDetailed.getSubscriptionMoney(); + BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney); + if (subtract.compareTo(BigDecimal.ZERO) < 0) { + return rb.setMsg("认款金额超出应收金额，请重新输入"); + } + busUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract)); + BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedDto = new BusUncollectedReceivablesDetailedDto(); + BeanUtil.copyProperties(busUncollectedReceivablesDetailedVo, busUncollectedReceivablesDetailedDto); + busUncollectedReceivablesDetailedService.updateBySid(busUncollectedReceivablesDetailedDto, busUncollectedReceivablesDetailedDto.getSid()); + } + List busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid1); + BigDecimal totalSubscriptionMone = null; + for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos) { + BigDecimal subscriptionMoney = new BigDecimal(busSelectedReceivablesDetailedVo.getSubscriptionMoney()); + totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney); + } + BigDecimal collectionMoney = busCollectionConfirmation.getCollectionMoney(); + BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone); + if (subtract.compareTo(BigDecimal.ZERO) < 0) { + return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对"); } - return rb.success().setMsg("修改成功"); + busCollectionConfirmation.setBalance(totalSubscriptionMone); + save(busCollectionConfirmation); + return rb.success().setMsg("添加成功"); } public ResultBean fetchByAllSid(String sid) {