From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractStatusListener.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractStatusListener.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractStatusListener.java
index ce82858..3d425ad 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractStatusListener.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractStatusListener.java
@@ -1,31 +1,56 @@
package cn.iocoder.yudao.module.crm.service.contract.listener;
import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent;
-import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
+import cn.iocoder.yudao.module.crm.dal.mysql.contract.CrmContractMapper;
+import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
import cn.iocoder.yudao.module.crm.service.contract.CrmContractService;
-import cn.iocoder.yudao.module.crm.service.contract.CrmContractServiceImpl;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
/**
- * 鍚堝悓瀹℃壒鐨勭粨鏋滅殑鐩戝惉鍣ㄥ疄鐜扮被
+ * 鍚堝悓瀹℃壒鐨勭粨鏋滅洃鍚櫒瀹炵幇绫�
+ *
+ * 閫氳繃 businessKey锛堝悎鍚孖D锛夊尮閰嶏紝鑰屼笉鏄浐瀹氱殑娴佺▼瀹氫箟 Key锛�
+ * 杩欐牱鍙互鏀寔鍒嗙被涓嬩换鎰� Key 鐨勬祦绋嬫ā鍨嬨��
*
* @author HUIHUI
*/
@Component
-public class CrmContractStatusListener extends BpmProcessInstanceStatusEventListener {
+@Slf4j
+public class CrmContractStatusListener implements ApplicationListener<BpmProcessInstanceStatusEvent> {
@Resource
private CrmContractService contractService;
+ @Resource
+ private CrmContractMapper contractMapper;
@Override
- public String getProcessDefinitionKey() {
- return CrmContractServiceImpl.BPM_PROCESS_DEFINITION_KEY;
- }
+ public void onApplicationEvent(BpmProcessInstanceStatusEvent event) {
+ // 閫氳繃 businessKey 鏌ヨ鍚堝悓
+ Long contractId;
+ try {
+ contractId = Long.parseLong(event.getBusinessKey());
+ } catch (NumberFormatException e) {
+ return; // businessKey 涓嶆槸鏁板瓧锛屽拷鐣�
+ }
- @Override
- protected void onEvent(BpmProcessInstanceStatusEvent event) {
- contractService.updateContractAuditStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());
+ CrmContractDO contract = contractMapper.selectById(contractId);
+ if (contract == null) {
+ return; // 涓嶆槸鍚堝悓锛屽拷鐣�
+ }
+
+ // 鍙湁瀹℃壒涓姸鎬佺殑鍚堝悓鎵嶅鐞�
+ if (!CrmAuditStatusEnum.PROCESS.getStatus().equals(contract.getAuditStatus())) {
+ log.warn("[onApplicationEvent] 鍚堝悓({}) 涓嶅浜庡鎵逛腑鐘舵�侊紝褰撳墠鐘舵��: {}", contractId, contract.getAuditStatus());
+ return;
+ }
+
+ log.info("[onApplicationEvent] 鍚堝悓({}) 瀹℃壒鐘舵�佹洿鏂�: {}", contractId, event.getStatus());
+ // 鏇存柊瀹℃壒鐘舵��
+ contractService.updateContractAuditStatus(contractId, event.getStatus());
}
}
--
Gitblit v1.9.3