Merge branch '20171106_delete_58jr' of...

Merge branch '20171106_delete_58jr' of http://gitabc.xyqb.com/head_group/xyqb-user2 into 20171106_delete_58jr

src/main/java/cn/quantgroup/xyqb/service/session/impl/SessionServiceImpl.java

@@ -197,25 +197,29 @@ public class SessionServiceImpl implements ISessionService {
             });
             //2.删除session缓存健
             stringRedisTemplate.delete(Constants.Session.USER_SESSION_KEY_SET + userId);
-            //3.删除用户查询缓存
-            User user = userService.findById(userId);
-            if (null != user) {
-                deleteUserCatch(user);
-            }
+
 
         }
+        //3.删除用户查询缓存
+        User user = userService.findById(userId);
+        if (null != user) {
+            deleteUserCatch(user);
+        }
 
 
     }
 
     /**
      * 删除注销后缓存查询结果
+     *
      * @param user
      */
     @Caching(evict = {@CacheEvict(value = "usercache", key = "'xyqbuser' + #user.phoneNo", cacheManager = "cacheManager"),
             @CacheEvict(value = "usercache", key = "'xyqbuser' + #user.uuid", cacheManager = "cacheManager"),
             @CacheEvict(value = "addresscache", key = "'address' + #user.id", cacheManager = "cacheManager"),
-            @CacheEvict(value = "contact", key = "'contact' + #user.id", cacheManager = "cacheManager")})
+            @CacheEvict(value = "contact", key = "'contact' + #user.id", cacheManager = "cacheManager"),
+            @CacheEvict(value = "userSpouseCache", key = "'spouse' + #user.id", cacheManager = "cacheManager"),
+            @CacheEvict(value = "btRegisterCache", key = "'userId' + #user.id", cacheManager = "cacheManager")})
     private void deleteUserCatch(User user) {
 
     }