分支自 mom-pro2-after
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
@@ -1,25 +1,23 @@ package cn.iocoder.yudao.module.erp.service.finance; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentPageReqVO; import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentSaveReqVO; import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentDO; import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentItemDO; import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO; import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnDO; import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO; import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpFinancePaymentItemMapper; import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpFinancePaymentMapper; import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO; import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus; import cn.iocoder.yudao.module.erp.enums.common.ErpBizTypeEnum; import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInService; import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseReturnService; import cn.iocoder.yudao.module.erp.enums.ErpPurchaseInvoiceAuditStatusEnum; import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInvoiceService; import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInvoiceServiceImpl; import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierService; import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -30,17 +28,16 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*; // TODO 芋艿：记录操作日志 /** * ERP 付款单 Service 实现类 * * @author 芋道源码 * @author 超级管理员 */ @Service @Validated @@ -59,12 +56,13 @@ @Resource private ErpAccountService accountService; @Resource private ErpPurchaseInService purchaseInService; @Resource private ErpPurchaseReturnService purchaseReturnService; private ErpPurchaseInvoiceService invoiceService; @Resource private AdminUserApi adminUserApi; @Resource private StorageAttachmentApi storageAttachmentApi; @Override @Transactional(rollbackFor = Exception.class) @@ -82,7 +80,13 @@ if (createReqVO.getFinanceUserId() != null) { adminUserApi.validateUser(createReqVO.getFinanceUserId()); } // 1.5 生成付款单号，并校验唯一性 // 1.5 校验关联来票 validateInvoiceForPayment(createReqVO.getInvoiceId(), createReqVO.getSupplierId()); // 1.6 校验付款金额不超过该来票剩余可付金额 validatePaymentPriceExceedsInvoiceRemaining(createReqVO.getInvoiceId(), getSumValue(paymentItems, ErpFinancePaymentItemDO::getPaymentPrice, BigDecimal::add, BigDecimal.ZERO) .subtract(createReqVO.getDiscountPrice()), null); // 1.7 生成付款单号，并校验唯一性 String no = noRedisDAO.generate(ErpNoRedisDAO.FINANCE_PAYMENT_NO_PREFIX); if (financePaymentMapper.selectByNo(no) != null) { throw exception(FINANCE_PAYMENT_NO_EXISTS); @@ -96,6 +100,10 @@ // 2.2 插入付款单项 paymentItems.forEach(o -> o.setPaymentId(payment.getId())); financePaymentItemMapper.insertBatch(paymentItems); // 2.3 绑定附件 storageAttachmentApi.bindAttachments("file", "erp_finance_payment", payment.getId(), createReqVO.getBlobIds()); // 3. 更新采购入库、退货的付款金额情况 updatePurchasePrice(paymentItems); @@ -123,6 +131,12 @@ // 1.5 校验付款单项的有效性 List<ErpFinancePaymentItemDO> paymentItems = validateFinancePaymentItems( updateReqVO.getSupplierId(), updateReqVO.getItems()); // 1.6 校验关联来票 validateInvoiceForPayment(updateReqVO.getInvoiceId(), updateReqVO.getSupplierId()); // 1.7 校验付款金额不超过该来票剩余可付金额（排除该付款单自身当前已付金额） validatePaymentPriceExceedsInvoiceRemaining(updateReqVO.getInvoiceId(), getSumValue(paymentItems, ErpFinancePaymentItemDO::getPaymentPrice, BigDecimal::add, BigDecimal.ZERO) .subtract(updateReqVO.getDiscountPrice()), payment.getPaymentPrice()); // 2.1 更新付款单 ErpFinancePaymentDO updateObj = BeanUtils.toBean(updateReqVO, ErpFinancePaymentDO.class); @@ -130,6 +144,8 @@ financePaymentMapper.updateById(updateObj); // 2.2 更新付款单项 updateFinancePaymentItemList(updateReqVO.getId(), paymentItems); // 2.3 更新附件 storageAttachmentApi.updateAttachments("file", "erp_finance_payment", updateReqVO.getId(), updateReqVO.getBlobIds()); } private void calculateTotalPrice(ErpFinancePaymentDO payment, List<ErpFinancePaymentItemDO> paymentItems) { @@ -159,28 +175,22 @@ private List<ErpFinancePaymentItemDO> validateFinancePaymentItems( Long supplierId, List<ErpFinancePaymentSaveReqVO.Item> list) { // 采购入库/退货功能已移除，暂时只支持手动录入付款明细 return convertList(list, o -> BeanUtils.toBean(o, ErpFinancePaymentItemDO.class, item -> { if (ObjectUtil.equal(item.getBizType(), ErpBizTypeEnum.PURCHASE_IN.getType())) { ErpPurchaseInDO purchaseIn = purchaseInService.validatePurchaseIn(item.getBizId()); Assert.equals(purchaseIn.getSupplierId(), supplierId, "供应商必须相同"); item.setTotalPrice(purchaseIn.getTotalPrice()).setBizNo(purchaseIn.getNo()); } else if (ObjectUtil.equal(item.getBizType(), ErpBizTypeEnum.PURCHASE_RETURN.getType())) { ErpPurchaseReturnDO purchaseReturn = purchaseReturnService.validatePurchaseReturn(item.getBizId()); Assert.equals(purchaseReturn.getSupplierId(), supplierId, "供应商必须相同"); item.setTotalPrice(purchaseReturn.getTotalPrice().negate()).setBizNo(purchaseReturn.getNo()); } else { throw new IllegalArgumentException("业务类型不正确：" + item.getBizType()); if (item.getPaymentPrice() == null) { item.setPaymentPrice(BigDecimal.ZERO); } if (item.getTotalPrice() == null) { item.setTotalPrice(BigDecimal.ZERO); } })); } private void updateFinancePaymentItemList(Long id, List<ErpFinancePaymentItemDO> newList) { // 第一步，对比新老数据，获得添加、修改、删除的列表 List<ErpFinancePaymentItemDO> oldList = financePaymentItemMapper.selectListByPaymentId(id); List<List<ErpFinancePaymentItemDO>> diffList = diffList(oldList, newList, // id 不同，就认为是不同的记录 List<List<ErpFinancePaymentItemDO>> diffList = diffList(oldList, newList, (oldVal, newVal) -> oldVal.getId().equals(newVal.getId())); // 第二步，批量添加、修改、删除 if (CollUtil.isNotEmpty(diffList.get(0))) { diffList.get(0).forEach(o -> o.setPaymentId(id)); financePaymentItemMapper.insertBatch(diffList.get(0)); @@ -191,23 +201,10 @@ if (CollUtil.isNotEmpty(diffList.get(2))) { financePaymentItemMapper.deleteByIds(convertList(diffList.get(2), ErpFinancePaymentItemDO::getId)); } // 第三步，更新采购入库、退货的付款金额情况 updatePurchasePrice(CollectionUtils.newArrayList(diffList)); } private void updatePurchasePrice(List<ErpFinancePaymentItemDO> paymentItems) { paymentItems.forEach(paymentItem -> { BigDecimal totalPaymentPrice = financePaymentItemMapper.selectPaymentPriceSumByBizIdAndBizType( paymentItem.getBizId(), paymentItem.getBizType()); if (ErpBizTypeEnum.PURCHASE_IN.getType().equals(paymentItem.getBizType())) { purchaseInService.updatePurchaseInPaymentPrice(paymentItem.getBizId(), totalPaymentPrice); } else if (ErpBizTypeEnum.PURCHASE_RETURN.getType().equals(paymentItem.getBizType())) { purchaseReturnService.updatePurchaseReturnRefundPrice(paymentItem.getBizId(), totalPaymentPrice.negate()); } else { throw new IllegalArgumentException("业务类型不正确：" + paymentItem.getBizType()); } }); // 采购入库/退货功能已移除，不再更新关联业务金额 } @Override @@ -226,9 +223,11 @@ // 2. 遍历删除，并记录操作日志 payments.forEach(payment -> { // 2.1 删除付款单 // 2.1 删除附件 storageAttachmentApi.deleteAttachmentsByRecord("erp_finance_payment", payment.getId()); // 2.2 删除付款单 financePaymentMapper.deleteById(payment.getId()); // 2.2 删除付款单项 // 2.3 删除付款单项 List<ErpFinancePaymentItemDO> paymentItems = financePaymentItemMapper.selectListByPaymentId(payment.getId()); financePaymentItemMapper.deleteByIds(convertSet(paymentItems, ErpFinancePaymentItemDO::getId)); @@ -245,6 +244,53 @@ return payment; } /** * 校验付款单关联的来票：存在、审批通过、已上传发票附件、供应商与来票一致 * * @param invoiceId 来票编号 * @param supplierId 供应商编号 */ private void validateInvoiceForPayment(Long invoiceId, Long supplierId) { // 1. 校验来票存在 ErpPurchaseInvoiceDO invoice = invoiceService.getPurchaseInvoice(invoiceId); if (invoice == null) { throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_NOT_EXISTS); } // 2. 校验来票审批通过 if (ObjectUtil.notEqual(invoice.getAuditStatus(), ErpPurchaseInvoiceAuditStatusEnum.APPROVE.getStatus())) { throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_NOT_APPROVE); } // 3. 校验已上传发票附件 if (CollUtil.isEmpty(storageAttachmentApi.listAttachments( ErpPurchaseInvoiceServiceImpl.PURCHASE_INVOICE_RECORD_TYPE, invoiceId))) { throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_NOT_ATTACHMENT); } // 4. 校验供应商与来票一致（防脏数据） if (ObjectUtil.notEqual(invoice.getSupplierId(), supplierId)) { throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_SUPPLIER_MISMATCH); } } /** * 校验付款金额不超过该来票剩余可付金额（来票金额 - 该来票已付款金额） * * @param invoiceId 来票编号 * @param paymentPrice 本次付款金额 * @param oldPaymentPrice 更新场景下，该付款单自身当前的付款金额（用于排除自身），创建场景传 null */ private void validatePaymentPriceExceedsInvoiceRemaining(Long invoiceId, BigDecimal paymentPrice, BigDecimal oldPaymentPrice) { ErpPurchaseInvoiceDO invoice = invoiceService.getPurchaseInvoice(invoiceId); BigDecimal paidPrice = financePaymentMapper.selectPaymentPriceMapByInvoiceId(List.of(invoiceId)) .getOrDefault(invoiceId, BigDecimal.ZERO); if (oldPaymentPrice != null) { paidPrice = paidPrice.subtract(oldPaymentPrice); // 排除该付款单自身当前已付金额 } BigDecimal remainingPrice = invoice.getPrice().subtract(paidPrice); if (paymentPrice.compareTo(remainingPrice) > 0) { throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_PRICE_EXCEEDS, remainingPrice); } } @Override public ErpFinancePaymentDO getFinancePayment(Long id) { return financePaymentMapper.selectById(id); @@ -255,6 +301,11 @@ return financePaymentMapper.selectPage(pageReqVO); } @Override public Map<Long, BigDecimal> getPaymentPriceMapByInvoiceId(Collection<Long> invoiceIds) { return financePaymentMapper.selectPaymentPriceMapByInvoiceId(invoiceIds); } // ==================== 付款单项 ==================== @Override
