Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-04-28 35f74c2abd95e6913180fbccd864915486eecc48

 src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java

@@ -6,12 +6,11 @@
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.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.time.LocalDateTime;
import java.util.Set;

/**
@@ -25,21 +24,18 @@
 */
@Slf4j
@Component
@RequiredArgsConstructor
public class ReturnVisitReminderTask {

    private static final String REMINDER_QUEUE_KEY = "return_visit:reminder:queue";

    @Autowired
    private RedisCache redisCache;
    private final RedisCache redisCache;

    @Autowired
    private CustomerReturnVisitService customerReturnVisitService;
    private final CustomerReturnVisitService customerReturnVisitService;

    @Autowired
    private UnipushService unipushService;
    private final UnipushService unipushService;

    @Autowired
    private SysUserClientService userClientService;
    private final SysUserClientService userClientService;

    @SuppressWarnings("unchecked")
    @Scheduled(fixedDelay = 60000)
@@ -76,7 +72,7 @@
        }

        try {
            unipushService.sendReturnVisitReminder(returnVisitId, client.getCid(), returnVisit.getContent(), returnVisit.getCustomerId());
            unipushService.sendReturnVisitReminder(returnVisitId, client.getCid(), returnVisit.getContent(), returnVisit.getCustomerPrivatePoolId());
            CustomerReturnVisit updateObj = new CustomerReturnVisit();
            updateObj.setId(returnVisitId);
            updateObj.setIsCompleted(1);