Merge branch 'feature/0803-im'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/TencentData.java

@@ -17,9 +17,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 
 /**
  * Description
@@ -115,6 +113,8 @@ public class TencentData {
         // 离开群的成员列表
         private List<MemberListDTO> memberList;
 
+        private Long eventTime;
+
         public static CallbackOnMemberStateChange toObject(String jsonString) {
 
             CallbackOnMemberStateChange res = new CallbackOnMemberStateChange();
@@ -138,6 +138,7 @@ public class TencentData {
             }
 
             res.setEventType(jsonObject.getString("EventType"));
+            res.setEventTime(Optional.ofNullable(jsonObject.getLong("EventTime")).orElse(new Date().getTime()));
 
             return res;
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/LiveRoomServiceImpl.java

@@ -1646,7 +1646,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
         for (Long userId : userIds) {
             ImUserStateSync imUserState = new ImUserStateSync();
             imUserState.setUserid(userId.toString());
-            imUserState.setStatus(userMap.getOrDefault(userId, new ImLiveBroadcastRoomMember()).getOnlineStatus() == 1 ? "0" : "1");
+            imUserState.setStatus("0");
             imUserState.setOs(callbackAfterNewMemberJoin.getOptPlatform());
             imUserState.setTime(callbackAfterNewMemberJoin.getEventTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
             imUserState.setRoomUid(callbackAfterNewMemberJoin.getGroupId());