refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）

liu

3 天以前 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java

@@ -2,6 +2,7 @@

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentPageReqVO;
@@ -13,25 +14,25 @@
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.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.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;

import java.math.BigDecimal;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.*;

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.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;

/**
@@ -41,7 +42,13 @@
 */
@Service
@Validated
@Slf4j
public class ErpFinancePaymentServiceImpl implements ErpFinancePaymentService {

    /**
     * 通用审批配置的业务类型编码（对应 system_approval_config.biz_type）
     */
    private static final String FINANCE_PAYMENT_APPROVE_BIZ_TYPE = "erp_finance_payment_approve";

    @Resource
    private ErpFinancePaymentMapper financePaymentMapper;
@@ -63,6 +70,9 @@

    @Resource
    private StorageAttachmentApi storageAttachmentApi;

    @Resource
    private ApprovalConfigApi approvalConfigApi;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -118,6 +128,9 @@
        if (ErpAuditStatus.APPROVE.getStatus().equals(payment.getStatus())) {
            throw exception(FINANCE_PAYMENT_UPDATE_FAIL_APPROVE, payment.getNo());
        }
        if (ErpAuditStatus.APPROVING.getStatus().equals(payment.getStatus())) {
            throw exception(FINANCE_PAYMENT_UPDATE_FAIL_APPROVING, payment.getNo());
        }
        // 1.2 校验供应商
        supplierService.validateSupplier(updateReqVO.getSupplierId());
        // 1.3 校验结算账户
@@ -155,21 +168,61 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateFinancePaymentStatus(Long id, Integer status) {
        boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
        // 1.1 校验存在
    public void submitFinancePayment(Long id) {
        // 1. 校验存在 + 可提交状态（未审核：含审核不通过退回后重新提交）
        ErpFinancePaymentDO payment = validateFinancePaymentExists(id);
        // 1.2 校验状态
        if (payment.getStatus().equals(status)) {
            throw exception(approve ? FINANCE_PAYMENT_APPROVE_FAIL : FINANCE_PAYMENT_PROCESS_FAIL);
        if (!ErpAuditStatus.PROCESS.getStatus().equals(payment.getStatus())) {
            throw exception(FINANCE_PAYMENT_SUBMIT_FAIL_NOT_ALLOWED);
        }
        // 2. 校验审批配置已启用且配置了有效审批人
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(FINANCE_PAYMENT_APPROVE_BIZ_TYPE);
        // 3. 状态置为审批中，并清空上一轮审核结果
        financePaymentMapper.submitAndResetAuditInfo(id, ErpAuditStatus.APPROVING.getStatus());
    }

        // 2. 更新状态
        int updateCount = financePaymentMapper.updateByIdAndStatus(id, payment.getStatus(),
                new ErpFinancePaymentDO().setStatus(status));
        if (updateCount == 0) {
            throw exception(approve ? FINANCE_PAYMENT_APPROVE_FAIL : FINANCE_PAYMENT_PROCESS_FAIL);
    @Override
    public Set<Long> getFinancePaymentApproverUserIds() {
        return approvalConfigApi.getApproverUserIds(FINANCE_PAYMENT_APPROVE_BIZ_TYPE);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void auditFinancePayment(Long id, Boolean pass, String reviewRemark) {
        // 1. 校验存在
        ErpFinancePaymentDO payment = validateFinancePaymentExists(id);
        // 2. 校验处于审批中状态
        if (!ErpAuditStatus.APPROVING.getStatus().equals(payment.getStatus())) {
            throw exception(FINANCE_PAYMENT_AUDIT_FAIL_NOT_PROCESS);
        }
        // 3. 校验当前登录用户是该业务类型的审批人（或签：任一人均可审核）
        Long userId = getLoginUserId();
        approvalConfigApi.validateApprover(FINANCE_PAYMENT_APPROVE_BIZ_TYPE, userId);
        // 4. 审核不通过：必须填写原因，退回财务人员修改后可重新提交
        if (!Boolean.TRUE.equals(pass)) {
            if (StrUtil.isBlank(reviewRemark)) {
                throw exception(FINANCE_PAYMENT_AUDIT_REJECT_REASON_REQUIRED);
            }
            financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.PROCESS.getStatus(),
                    userId, getUserNickname(userId), reviewRemark);
            return;
        }
        // 5. 审核通过：记录审核人与审核意见，状态置为已审核
        financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark);
    }

    /**
     * 获取用户昵称
     *
     * @param userId 用户编号
     * @return 昵称，用户不存在时返回 null
     */
    private String getUserNickname(Long userId) {
        if (userId == null) {
            return null;
        }
        AdminUserRespDTO user = adminUserApi.getUser(userId);
        return user == null ? null : user.getNickname();
    }

    private List<ErpFinancePaymentItemDO> validateFinancePaymentItems(
@@ -219,6 +272,9 @@
            if (ErpAuditStatus.APPROVE.getStatus().equals(payment.getStatus())) {
                throw exception(FINANCE_PAYMENT_DELETE_FAIL_APPROVE, payment.getNo());
            }
            if (ErpAuditStatus.APPROVING.getStatus().equals(payment.getStatus())) {
                throw exception(FINANCE_PAYMENT_DELETE_FAIL_APPROVING, payment.getNo());
            }
        });

        // 2. 遍历删除，并记录操作日志
@@ -245,7 +301,7 @@
    }

    /**
     * 校验付款单关联的来票：存在、审批通过、已上传发票附件、供应商与来票一致
     * 校验付款单关联的来票：存在、已上传发票附件、供应商与来票一致
     *
     * @param invoiceId 来票编号
     * @param supplierId 供应商编号
@@ -256,16 +312,12 @@
        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. 校验已上传发票附件
        // 2. 校验已上传发票附件
        if (CollUtil.isEmpty(storageAttachmentApi.listAttachments(
                ErpPurchaseInvoiceServiceImpl.PURCHASE_INVOICE_RECORD_TYPE, invoiceId))) {
            throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_NOT_ATTACHMENT);
        }
        // 4. 校验供应商与来票一致（防脏数据）
        // 3. 校验供应商与来票一致（防脏数据）
        if (ObjectUtil.notEqual(invoice.getSupplierId(), supplierId)) {
            throw exception(FINANCE_PAYMENT_CREATE_FAIL_INVOICE_SUPPLIER_MISMATCH);
        }