From bf71f1fd72fa08204b67bd14a656890015b75247 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 三月 2022 22:04:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index da273b5..4ba20f5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -710,6 +710,7 @@
         }
         ComActVO comActVO = userDao.selectCommunity(loginUserInfoVO.getCommunityId());
         if (!ObjectUtils.isEmpty(comActVO)) {
+            loginUserInfoVO.setComActVO(comActVO);
             loginUserInfoVO.setCommunityName(comActVO.getName());
             loginUserInfoVO.setAreaCode(comActVO.getAreaCode());
         }
@@ -2954,6 +2955,20 @@
     }
 
     /**
+     * 删除用户信息缓存
+     * @param phone
+     */
+    @Override
+    public R deleteUserCashByPhone(String phone) {
+        SysUserDO sysUserDO = this.userDao.selectOne(new LambdaQueryWrapper<SysUserDO>().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, 1));
+        if (nonNull(sysUserDO)) {
+            String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
+            stringRedisTemplate.delete(userKey);
+        }
+        return R.ok();
+    }
+
+    /**
      * 微商业街新增商家账号
      * @param mcsMerchantDTO
      * @return 商家用户id

--
Gitblit v1.7.1