From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/invoice/CrmInvoiceServiceImpl.java | 107 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 72 insertions(+), 35 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 0844616..326a256 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
@@ -5,12 +5,11 @@
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjUtil;
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.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
-import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoicePageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.invoice.vo.invoice.CrmInvoiceSaveReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
@@ -24,8 +23,10 @@
import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
import cn.iocoder.yudao.module.crm.service.permission.CrmPermissionService;
import cn.iocoder.yudao.module.crm.service.permission.bo.CrmPermissionCreateReqBO;
+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 com.mzt.logapi.context.LogRecordContext;
import com.mzt.logapi.service.impl.DiffParseFunction;
import com.mzt.logapi.starter.annotation.LogRecord;
@@ -39,11 +40,12 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.crm.enums.LogRecordConstants.*;
-import static cn.iocoder.yudao.module.crm.util.CrmAuditStatusUtils.convertBpmResultToAuditStatus;
/**
* CRM 寮�绁� Service 瀹炵幇绫�
@@ -56,9 +58,11 @@
public class CrmInvoiceServiceImpl implements CrmInvoiceService {
/**
- * BPM 寮�绁ㄥ鎵规祦绋嬫爣璇�
+ * CRM 寮�绁ㄥ鎵圭殑涓氬姟绫诲瀷缂栫爜
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鎵逛汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
*/
- public static final String BPM_PROCESS_DEFINITION_KEY = "crm-invoice-audit";
+ private static final String INVOICE_APPROVE_BIZ_TYPE = "crm_invoice_approve";
/**
* 鍙戠エ闄勪欢鐨勪笟鍔¤褰曠被鍨嬶紝瀵瑰簲 {@link cn.iocoder.yudao.module.system.enums.storage.StorageRecordTypeEnum#CRM_INVOICE}
@@ -79,7 +83,7 @@
@Resource
private AdminUserApi adminUserApi;
@Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
+ private ApprovalConfigApi approvalConfigApi;
@Resource
private StorageAttachmentApi storageAttachmentApi;
@@ -119,10 +123,10 @@
}
private void validateInvoicePriceExceedsLimit(CrmInvoiceSaveReqVO reqVO) {
- // 1. 璁＄畻鍓╀綑鍙紑绁ㄩ噾棰濓紝涓嶅寘鎷� reqVO 鑷韩
+ // 1. 璁＄畻鍓╀綑鍙紑绁ㄩ噾棰濓紝涓嶅寘鎷� reqVO 鑷韩锛堝鎵逛腑涔熷崰鐢ㄩ搴︼紝闃叉绱寮�绁ㄨ秴杩囧悎鍚岄噾棰濓級
CrmContractDO contract = contractService.validateContract(reqVO.getContractId());
List<CrmInvoiceDO> invoices = invoiceMapper.selectListByContractIdAndStatus(reqVO.getContractId(),
- List.of(CrmAuditStatusEnum.APPROVE.getStatus()));
+ List.of(CrmAuditStatusEnum.APPROVE.getStatus(), CrmAuditStatusEnum.PROCESS.getStatus()));
if (reqVO.getId() != null) {
invoices.removeIf(invoice -> ObjectUtil.equal(invoice.getId(), reqVO.getId()));
}
@@ -182,22 +186,6 @@
}
@Override
- public void updateInvoiceAuditStatus(Long id, Integer bpmResult) {
- // 1.1 鏍￠獙瀛樺湪
- CrmInvoiceDO invoice = validateInvoiceExists(id);
- // 1.2 鍙湁瀹℃壒涓紝鍙互鏇存柊瀹℃壒缁撴灉
- if (ObjUtil.notEqual(invoice.getAuditStatus(), CrmAuditStatusEnum.PROCESS.getStatus())) {
- log.error("[updateInvoiceAuditStatus][invoice({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
- invoice.getId(), bpmResult);
- throw exception(INVOICE_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
- }
-
- // 2. 鏇存柊寮�绁ㄥ鎵圭姸鎬�
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- invoiceMapper.updateById(new CrmInvoiceDO().setId(id).setAuditStatus(auditStatus));
- }
-
- @Override
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = CRM_INVOICE_TYPE, subType = CRM_INVOICE_DELETE_SUB_TYPE, bizNo = "{{#id}}",
success = CRM_INVOICE_DELETE_SUCCESS)
@@ -225,25 +213,74 @@
@Transactional(rollbackFor = Exception.class)
@LogRecord(type = CRM_INVOICE_TYPE, subType = CRM_INVOICE_SUBMIT_SUB_TYPE, bizNo = "{{#id}}",
success = CRM_INVOICE_SUBMIT_SUCCESS)
- public void submitInvoice(Long id, Long userId) {
- // 1. 鏍￠獙寮�绁ㄦ槸鍚﹀湪瀹℃壒
+ public void submitInvoice(Long id) {
+ // 1. 鏍￠獙瀛樺湪 + 鍙彁浜ょ姸鎬侊紙鏈彁浜� / 瀹℃牳涓嶉�氳繃锛�
CrmInvoiceDO invoice = validateInvoiceExists(id);
- if (ObjUtil.notEqual(invoice.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())) {
- throw exception(INVOICE_SUBMIT_FAIL_NOT_DRAFT);
+ if (ObjUtil.notEqual(invoice.getAuditStatus(), CrmAuditStatusEnum.DRAFT.getStatus())
+ && ObjUtil.notEqual(invoice.getAuditStatus(), CrmAuditStatusEnum.REJECT.getStatus())) {
+ throw exception(INVOICE_SUBMIT_FAIL_NOT_EDITABLE);
}
- // 2. 鍒涘缓寮�绁ㄥ鎵规祦绋嬪疄渚�
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY).setBusinessKey(String.valueOf(id)));
+ // 2. 閲嶆柊鏍￠獙鍙紑绁ㄩ噾棰濓紝闃叉绱寮�绁ㄨ秴杩囧悎鍚岄噾棰濓紙鑽夌鏈熷悗鍙兘鏈夊叾浠栧崟杩涘叆瀹℃壒涓級
+ validateInvoicePriceExceedsLimit(new CrmInvoiceSaveReqVO()
+ .setId(invoice.getId()).setContractId(invoice.getContractId()).setPrice(invoice.getPrice()));
- // 3. 鏇存柊寮�绁ㄥ伐浣滄祦缂栧彿
- invoiceMapper.updateById(new CrmInvoiceDO().setId(id).setProcessInstanceId(processInstanceId)
- .setAuditStatus(CrmAuditStatusEnum.PROCESS.getStatus()));
+ // 3. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(INVOICE_APPROVE_BIZ_TYPE);
- // 4. 璁板綍鏃ュ織
+ // 4. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
+ invoiceMapper.submitAndResetAuditInfo(id, CrmAuditStatusEnum.PROCESS.getStatus());
+
+ // 5. 璁板綍鏃ュ織
LogRecordContext.putVariable("invoiceNo", invoice.getNo());
}
+ @Override
+ public Set<Long> getInvoiceApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(INVOICE_APPROVE_BIZ_TYPE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditInvoice(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙瀛樺湪
+ CrmInvoiceDO invoice = validateInvoiceExists(id);
+ // 2. 鏍￠獙澶勪簬瀹℃壒涓姸鎬�
+ if (ObjUtil.notEqual(invoice.getAuditStatus(), CrmAuditStatusEnum.PROCESS.getStatus())) {
+ throw exception(INVOICE_AUDIT_FAIL_NOT_PROCESS);
+ }
+ // 3. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鎵逛汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(INVOICE_APPROVE_BIZ_TYPE, userId);
+ // 4. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝鐘舵�佺疆涓哄鏍镐笉閫氳繃锛岄��鍥炴彁浜や汉淇敼鍚庡彲閲嶆柊鎻愪氦
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(INVOICE_AUDIT_REJECT_REASON_REQUIRED);
+ }
+ invoiceMapper.auditInvoice(id, CrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ return;
+ }
+ // 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
+ // 锛堝紑绁ㄦ棤棰濆鍚庣疆涓氬姟閫昏緫锛屽鎵归�氳繃鍚庡嵆鍙敤浜庡垱寤哄洖娆� / 鍏宠仈寮�绁ㄩ�夋嫨锛�
+ invoiceMapper.auditInvoice(id, CrmAuditStatusEnum.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 CrmInvoiceDO validateInvoiceExists(Long id) {
CrmInvoiceDO invoice = invoiceMapper.selectById(id);
if (invoice == null) {
--
Gitblit v1.9.3