1

src/main/java/com/fdkankan/tk/service/IRoomService.java

@@ -42,7 +42,7 @@ public interface IRoomService extends IService<Room> {
 
     List<Room> getRunningRoom();
 
-    void stopRoom(String roomId,Integer roomUserId);
+    void stopRoom(String roomId,Integer roomUserId,Integer roomStatus);
 
     HashMap<String, Room> getByIds(Set<String> roomIds);
 

src/main/java/com/fdkankan/tk/service/IRoomUserService.java

@@ -29,7 +29,7 @@ public interface IRoomUserService extends IService<RoomUser> {
 
     void delByUserNameList(List<String> delUserName,String roomId);
 
-    void stopRoom(RoomUser roomUser);
+    void stopRoom(RoomUser roomUser,Integer roomStatus);
 
     List<RoomUser> getRunningRoom();
 

src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -364,7 +364,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             roomVisitLogService.addLog(roomId,roomUserId,userId,type);
         }
         if(type == 1 ){   //离开房间
-            //this.stopRoom(roomId,roomUserId);
+            this.stopRoom(roomId,roomUserId,1);
             roomVisitLogService.addLog(roomId,roomUserId,userId,type);
         }
         room.setLastLookTime(DateUtil.formatDateTime(new Date()));
@@ -386,27 +386,29 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     }
 
     @Override
-    public void stopRoom(String roomId,Integer roomUserId) {
+    public void stopRoom(String roomId,Integer roomUserId,Integer roomStatus) {
         if(roomUserId == null){
-            LambdaUpdateWrapper<Room> wrapper = new LambdaUpdateWrapper<>();
-            wrapper.eq(Room::getRoomId,roomId);
-            wrapper.set(Room::getRoomStatus,2);
-            this.update(wrapper);
+            if(roomStatus == 2){
+                LambdaUpdateWrapper<Room> wrapper = new LambdaUpdateWrapper<>();
+                wrapper.eq(Room::getRoomId,roomId);
+                wrapper.set(Room::getRoomStatus,roomStatus);
+                this.update(wrapper);
+
+                List<RoomUser> byRoomId = roomUserService.getByRoomId(roomId);
+                for (RoomUser roomUser : byRoomId) {
+                    roomUserService.stopRoom(roomUser,roomStatus);
+                }
+            }
+
             roomVisitLogService.stopRoom(roomId,roomUserId);
             roomDanmakuService.saveDanMaku(roomId,roomUserId);
-
-            List<RoomUser> byRoomId = roomUserService.getByRoomId(roomId);
-            for (RoomUser roomUser : byRoomId) {
-                roomUserService.stopRoom(roomUser);
-            }
         }else {
             RoomUser roomUser = roomUserService.getById(roomUserId);
             if(roomUser != null){
-                roomUserService.stopRoom(roomUser);
+                roomUserService.stopRoom(roomUser,roomStatus);
             }
         }
 
-
     }
 
     @Override

src/main/java/com/fdkankan/tk/service/impl/RoomUserServiceImpl.java

@@ -120,12 +120,13 @@ public class RoomUserServiceImpl extends ServiceImpl<IRoomUserMapper, RoomUser>
     }
 
     @Override
-    public void stopRoom(RoomUser roomUser) {
-        LambdaUpdateWrapper<RoomUser> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(RoomUser::getRoomUserId,roomUser.getRoomUserId());
-        wrapper.set(RoomUser::getRoomStatus,2);
-        this.update(wrapper);
-
+    public void stopRoom(RoomUser roomUser,Integer roomStatus) {
+        if(roomStatus == 2){
+            LambdaUpdateWrapper<RoomUser> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(RoomUser::getRoomUserId,roomUser.getRoomUserId());
+            wrapper.set(RoomUser::getRoomStatus,roomStatus);
+            this.update(wrapper);
+        }
         roomVisitLogService.stopRoom(roomUser.getRoomId(),roomUser.getRoomUserId());
         roomDanmakuService.saveDanMaku(roomUser.getRoomId(),roomUser.getRoomUserId());
     }

src/main/java/com/fdkankan/tk/task/TaskService.java

@@ -41,7 +41,7 @@ public class TaskService {
                 }
                 int comp = DateUtil.compDateStr(room.getUseEndTime(), new Date());
                 if(comp < 0){            //房间已过期关闭
-                    roomService.stopRoom(room.getRoomId(),null);
+                    roomService.stopRoom(room.getRoomId(),null,2);
                     stopRoomIds.add(room.getRoomId());
                 }
             }

src/main/resources/mapper/tk/RoomDanmakuMapper.xml

@@ -15,7 +15,7 @@
 
     </select>
     <select id="pageList" resultType="com.fdkankan.tk.response.UserMsgVo">
-        select rd.room_id,rd.user_id as wxUserId,rd.nick_name ,r.room_title,wx.phone_number from t_room_danmaku rd
+        select rd.room_id,rd.user_id as wxUserId,rd.nick_name ,r.room_title,wx.phone_number  from t_room_danmaku rd
         LEFT JOIN t_room r  on rd.room_id = r.room_id
         LEFT JOIN t_wx_user wx  on rd.user_id = wx.wx_user_id
         where rd.tb_status = 0