From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java b/src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java
index fbfb5b6..81066d6 100644
--- a/src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java
+++ b/src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java
@@ -3,9 +3,7 @@
import com.ruoyi.basic.pojo.CustomerReturnVisit;
import com.ruoyi.basic.service.CustomerReturnVisitService;
import com.ruoyi.framework.redis.RedisCache;
-import com.ruoyi.project.system.domain.SysUserClient;
-import com.ruoyi.project.system.service.SysUserClientService;
-import com.ruoyi.project.system.service.impl.UnipushService;
+
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
@@ -33,9 +31,7 @@
private final CustomerReturnVisitService customerReturnVisitService;
- private final UnipushService unipushService;
- private final SysUserClientService userClientService;
@SuppressWarnings("unchecked")
@Scheduled(fixedDelay = 60000)
@@ -59,30 +55,22 @@
}
}
- @SuppressWarnings("unchecked")
private void processReminder(Long returnVisitId) {
CustomerReturnVisit returnVisit = customerReturnVisitService.getById(returnVisitId);
if (returnVisit == null || returnVisit.getIsEnabled() == 0 || returnVisit.getIsCompleted() == 1) {
return;
}
- SysUserClient client = userClientService.getById(returnVisit.getRemindUserId());
- if (client == null || client.getCid() == null) {
- log.warn("鐢ㄦ埛鏈粦瀹欳ID, 鏃犳硶鍙戦�乁nipush鎺ㄩ��: userId={}", returnVisit.getRemindUserId());
- return;
- }
try {
- unipushService.sendReturnVisitReminder(returnVisitId, client.getCid(), returnVisit.getContent(), returnVisit.getCustomerId());
+ // 鏍囪宸插鐞嗭紙鎺ㄩ�佸姛鑳藉凡绂佺敤锛�
CustomerReturnVisit updateObj = new CustomerReturnVisit();
updateObj.setId(returnVisitId);
updateObj.setIsCompleted(1);
customerReturnVisitService.updateById(updateObj);
- log.info("鍥炶鎻愰啋宸查�氳繃 Unipush 鍙戦��: ID={}", returnVisitId);
+ log.info("鍥炶鎻愰啋宸插鐞嗭紙鎺ㄩ�佸姛鑳藉凡绂佺敤锛�: ID={}", returnVisitId);
} catch (Exception e) {
- log.error("鍙戦�佸洖璁挎彁閱掑け璐ワ紝閲嶆柊鍔犲叆闃熷垪: ID={}", returnVisitId, e);
- long retryTime = System.currentTimeMillis() + 60000;
- redisCache.redisTemplate.opsForZSet().add(REMINDER_QUEUE_KEY, returnVisitId, retryTime);
+ log.error("澶勭悊鍥炶鎻愰啋澶辫触: ID={}", returnVisitId, e);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3