消息、通知、交易

alien-store/src/main/java/shop/alien/store/config/WebSocketProcess.java

@@ -79,7 +79,7 @@ public class WebSocketProcess {
         //客户端连接关闭时，移除map中存储的键值对
         concurrentHashMap.remove(id);
         log.info("WebSocketProcess.onClose() close a websocket, concurrentHashMap remove sessionId= {}", id);
-        baseRedisService.delete("blackList_" + id);
+        if (baseRedisService.hasKey("blackList_" + id)) baseRedisService.delete("blackList_" + id);
     }
 
     /**

alien-store/src/main/java/shop/alien/store/service/LifeUserDynamicsService.java

@@ -358,6 +358,7 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
         LifeBlacklist lifeBlacklist = lifeBlacklistMapper.selectOne(lifeBlacklistWrapper);
         //是否拉黑 已拉黑1 未拉黑0
         int isBlocked = lifeBlacklist != null ? 1 : 0;
+        int blockId = lifeBlacklist != null ? lifeBlacklist.getId() : 0;
 
         // 好友动态
         LambdaQueryWrapper<LifeUserDynamics> wrapper = new LambdaQueryWrapper<>();
@@ -408,6 +409,7 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
         resultMap.put("likeListSum", dianzanCount);
 
         resultMap.put("isBlocked", isBlocked);
+        resultMap.put("blockId", blockId);
         resultMap.put("lifeUserDynamics", lifeUserDynamicsVoList);
         if (lifeUser.getUserName() != null) {
             resultMap.put("name", lifeUser.getUserName());