From 21bdfeccf233f6981fd5ede878267949925269eb Mon Sep 17 00:00:00 2001
From: bynt <ningtao/19960909>
Date: Fri, 19 May 2023 11:08:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CompanyServiceImpl.java      | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/CompanyServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/CompanyServiceImpl.java
index f5bc6cc0..c85b1d52 100644
--- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/CompanyServiceImpl.java
+++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/CompanyServiceImpl.java
@@ -6,7 +6,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.exception.BadRequestException;
 import com.baiye.exception.EntityExistException;
-import com.baiye.feign.IRemoteAuthService;
 import com.baiye.model.enums.ResponseCode;
 import com.baiye.modules.platform.domain.Company;
 import com.baiye.modules.platform.domain.PayFatherTemplate;
@@ -20,10 +19,9 @@ import com.baiye.modules.platform.service.dto.CompanyComboDTO;
 import com.baiye.modules.platform.service.dto.CompanyDto;
 import com.baiye.modules.platform.service.dto.CompanyQueryCriteria;
 import com.baiye.modules.platform.service.mapstruct.CompanyMapper;
+import com.baiye.modules.system.domain.User;
 import com.baiye.modules.system.repository.UserRepository;
-import com.baiye.util.PageUtil;
-import com.baiye.util.QueryHelp;
-import com.baiye.util.SecurityUtils;
+import com.baiye.util.*;
 import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;
@@ -33,7 +31,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -48,7 +45,7 @@ public class CompanyServiceImpl implements CompanyService {
 
     private final PayFatherTemplateService payFatherTemplateService;
 
-    private final IRemoteAuthService remoteAuthService;
+    private final RedisUtils redisUtils;
 
     private final CompanyRepository companyRepository;
 
@@ -138,16 +135,25 @@ public class CompanyServiceImpl implements CompanyService {
                     throw new BadRequestException(ResponseCode.USER_INFORMATION_ERROR.getDesc());
                 }
                 userRepository.updateStatusById(Boolean.TRUE, company.getUserId());
-                // 踢出用户
-                this.remoteAuthService.delete(Collections.singleton(company.getUserId()));
+                User user = userRepository.findById(company.getUserId()).orElseGet(User::new);
+                if (ObjectUtil.isNotNull(user)) {
+                    delCaches(user.getId(), user.getUsername());
+                }
             }
             if (status == DefaultNumberConstants.ONE_NUMBER) {
                 userRepository.updateStatusByCompanyId(Boolean.TRUE, id);
             }
+
         }
         companyRepository.updateCompanyStatus(id, status);
     }
 
+    public void delCaches(Long id, String username) {
+        this.redisUtils.del(CacheKey.USER_DETAILS + "::" + username);
+        // 清除缓存
+        redisUtils.del(CacheKey.USER_ID + id);
+    }
+
     @Override
     @CacheEvict(cacheNames = "companyCache", key = "#companyDto.id")
     public void updateCompany(CompanyDto companyDto) {