From 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 15:43:33 +0800
Subject: [PATCH] fix: 完善审批流程与业务状态校验
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
index 326a256..7e7b2ad 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java
@@ -166,9 +166,9 @@
// 1.2 鏍￠獙鍙紑绁ㄩ噾棰濊秴杩囦笂闄�
validateInvoicePriceExceedsLimit(updateReqVO);
- // 1.3 鍙湁鑽夌銆佸鎵逛腑锛屽彲浠ョ紪杈戯紱
+ // 1.3 鍙湁鑽夌銆佸鏍镐笉閫氳繃锛屽彲浠ョ紪杈戯紱
if (!ObjectUtils.equalsAny(oldInvoice.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus(),
- CrmAuditStatusEnum.PROCESS.getStatus())) {
+ CrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(INVOICE_UPDATE_FAIL_EDITING_PROHIBITED);
}
@@ -213,6 +213,7 @@
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = CRM_INVOICE_TYPE, subType = CRM_INVOICE_SUBMIT_SUB_TYPE, bizNo = "{{#id}}",
success = CRM_INVOICE_SUBMIT_SUCCESS)
+ @CrmPermission(bizType = CrmBizTypeEnum.CRM_INVOICE, bizId = "#id", level = CrmPermissionLevelEnum.WRITE)
public void submitInvoice(Long id) {
// 1. 鏍￠獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鏈彁浜� / 瀹℃牳涓嶉�氳繃锛�
CrmInvoiceDO invoice = validateInvoiceExists(id);
@@ -229,7 +230,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(INVOICE_APPROVE_BIZ_TYPE);
// 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- invoiceMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
+ if (invoiceMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(INVOICE_SUBMIT_FAIL_NOT_EDITABLE);
+ }
// 5. 璁板綍鏃ュ織
LogRecordContext.putVariable("invoiceNo", invoice.getNo());
@@ -257,14 +260,18 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(INVOICE_AUDIT_REJECT_REASON_REQUIRED);
}
- invoiceMapper.auditInvoice(id, CrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (invoiceMapper.auditInvoice(id, CrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(INVOICE_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
// 锛堝紑绁ㄦ棤棰濆鍚庣疆涓氬姟閫昏緫锛屽鎵归�氳繃鍚庡嵆鍙敤浜庡垱寤哄洖娆� / 鍏宠仈寮�绁ㄩ�夋嫨锛�
- invoiceMapper.auditInvoice(id, CrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (invoiceMapper.auditInvoice(id, CrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(INVOICE_AUDIT_FAIL_NOT_PROCESS);
+ }
}
/**
--
Gitblit v1.9.3