fix: 完善审批流程与业务状态校验

liu

2026-10-23 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8

 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/refund/CrmRefundServiceImpl.java

@@ -17,6 +17,7 @@
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -78,23 +79,36 @@

    @Override
    public void updateRefund(CrmRefundSaveReqVO updateReqVO) {
        // 1. 校验存在 + 审核通过的退费单不允许修改
        // 1. 校验存在 + 只有草稿、审核不通过可以修改
        CrmRefundDO refund = validateRefundExists(updateReqVO.getId());
        if (ObjUtil.equal(refund.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
            throw exception(ErrorCodeConstants.CRM_REFUND_UPDATE_FAIL_APPROVE);
        if (ObjUtil.notEqual(refund.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
                && ObjUtil.notEqual(refund.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
            throw exception(ErrorCodeConstants.CRM_REFUND_UPDATE_FAIL_NOT_EDITABLE);
        }
        // 2. 更新退费单
        // 2. 更新退费单；审批状态与审核结果只能由提交/审核变更，此处显式清空
        CrmRefundDO entity = BeanUtils.toBean(updateReqVO, CrmRefundDO.class);
        entity.setAuditStatus(null); // 审批状态只能由提交/审核变更
        refundMapper.updateById(entity);
        // 审核相关字段只能由提交/审核变更
        entity.setAuditStatus(null);
        entity.setReviewerId(null);
        entity.setReviewerName(null);
        entity.setReviewTime(null);
        entity.setReviewRemark(null);
        refundMapper.update(entity, new LambdaUpdateWrapper<CrmRefundDO>()
                .eq(CrmRefundDO::getId, entity.getId())
                .set(CrmRefundDO::getAuditStatus, null)
                .set(CrmRefundDO::getReviewerId, null)
                .set(CrmRefundDO::getReviewerName, null)
                .set(CrmRefundDO::getReviewTime, null)
                .set(CrmRefundDO::getReviewRemark, null));
    }

    @Override
    public void deleteRefund(Long id) {
        // 校验存在 + 审核通过的退费单不允许删除
        // 校验存在 + 只有草稿、审核不通过可以删除
        CrmRefundDO refund = validateRefundExists(id);
        if (ObjUtil.equal(refund.getAuditStatus(), CrmAuditStatusEnum.APPROVE.getStatus())) {
            throw exception(ErrorCodeConstants.CRM_REFUND_DELETE_FAIL_APPROVE);
        if (ObjUtil.notEqual(refund.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
                && ObjUtil.notEqual(refund.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
            throw exception(ErrorCodeConstants.CRM_REFUND_DELETE_FAIL_NOT_EDITABLE);
        }
        refundMapper.deleteById(id);
    }
@@ -129,7 +143,9 @@
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(REFUND_APPROVE_BIZ_TYPE);

        // 3. 状态置为审批中，并清空上一轮审核结果，避免残留「审核不通过」的原因
        refundMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
        if (refundMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
            throw exception(ErrorCodeConstants.CRM_REFUND_SUBMIT_FAIL_NOT_EDITABLE);
        }
    }

    @Override
@@ -154,13 +170,17 @@
            if (StrUtil.isBlank(reviewRemark)) {
                throw exception(ErrorCodeConstants.CRM_REFUND_AUDIT_REJECT_REASON_REQUIRED);
            }
            refundMapper.auditRefund(id, CrmAuditStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark);
            if (refundMapper.auditRefund(id, CrmAuditStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark) != 1) {
                throw exception(ErrorCodeConstants.CRM_REFUND_AUDIT_FAIL_NOT_PROCESS);
            }
            return;
        }
        // 5. 审核通过：记录审核人与审核意见，状态置为审核通过
        refundMapper.auditRefund(id, CrmAuditStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark);
        if (refundMapper.auditRefund(id, CrmAuditStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark) != 1) {
            throw exception(ErrorCodeConstants.CRM_REFUND_AUDIT_FAIL_NOT_PROCESS);
        }
    }

    private CrmRefundDO validateRefundExists(Long id) {