From 4bc513be11e671caf20ec6013a51dee42c2ed96e Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 18:31:26 +0800
Subject: [PATCH] fix(crm): 禁止物料类合同开票
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/refund/CrmRefundServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 69 insertions(+), 14 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/refund/CrmRefundServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/refund/CrmRefundServiceImpl.java
index 9d3adad..be2568c 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/refund/CrmRefundServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/refund/CrmRefundServiceImpl.java
@@ -14,9 +14,13 @@
import cn.iocoder.yudao.module.crm.dal.mysql.refund.CrmRefundMapper;
import cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants;
import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
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;
@@ -43,6 +47,11 @@
*/
private static final String REFUND_APPROVE_BIZ_TYPE = "refund_approve";
+ /**
+ * CRM 閫�璐瑰崟瀹℃壒鐨� BPM 娴佺▼瀹氫箟 Key
+ */
+ private static final String REFUND_APPROVE_PROCESS_KEY = "refund_approve";
+
@Resource
private CrmRefundMapper refundMapper;
@Resource
@@ -51,6 +60,8 @@
private AdminUserApi adminUserApi;
@Resource
private ApprovalConfigApi approvalConfigApi;
+ @Resource
+ private BpmProcessInstanceApi bpmProcessInstanceApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -78,23 +89,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 +153,15 @@
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);
+ }
+
+ // 4. 鍒涘缓 BPM 娴佺▼瀹炰緥锛屼娇瀹℃壒鍑虹幇鍦ㄣ�屽崗鍚屽姙鍏� - 鎴戠殑娴佺▼銆�
+ bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(REFUND_APPROVE_PROCESS_KEY)
+ .setBusinessKey(String.valueOf(id)));
}
@Override
@@ -154,13 +186,36 @@
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);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRefundAuditStatus(Long id, Integer bpmStatus, String reason) {
+ // BPM 瀹℃壒缁撴灉鏄犲皠涓洪��璐瑰崟瀹℃牳鐘舵�侊細閫氳繃=20 / 涓嶉�氳繃=30 / 鍙栨秷=40
+ Integer auditStatus;
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.APPROVE.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.REJECT.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmStatus)) {
+ auditStatus = CrmAuditStatusEnum.CANCEL.getStatus();
+ } else {
+ return;
+ }
+ if (refundMapper.updateAuditStatusByBpm(id, auditStatus, reason) != 1) {
+ log.warn("[updateRefundAuditStatus] 閫�璐瑰崟({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝蹇界暐 BPM 缁撴灉({})", id, bpmStatus);
+ }
}
private CrmRefundDO validateRefundExists(Long id) {
--
Gitblit v1.9.3