1

src/main/java/com/fdkankan/tk/controller/WxApiController.java

@@ -63,6 +63,7 @@ public class WxApiController extends BaseController{
     @PostMapping("/roomList")
     public ResultData list(@RequestBody InnerRoomParam param){
         param.setIsShow(1);
+        param.setSource(1);
         return ResultData.ok(innerService.roomList(param));
     }
     /**

src/main/java/com/fdkankan/tk/inner/request/InnerRoomParam.java

@@ -14,4 +14,6 @@ public class InnerRoomParam extends RequestBase {
     private String field;
 
     private String order;
+
+    private Integer source = 0;
 }

src/main/java/com/fdkankan/tk/inner/service/InnerService.java

@@ -36,6 +36,9 @@ public class InnerService {
 
     public Object roomList(InnerRoomParam param) {
         LambdaQueryWrapper<Room> wrapper = new LambdaQueryWrapper<>();
+        if(param.getSource() != null && param.getSource() == 1){
+            wrapper.in(Room::getRoomStatus,0,1);
+        }
         if(StringUtils.isNotBlank(param.getRoomTitle())){
             wrapper.like(Room::getRoomTitle,param.getRoomTitle());
         }
@@ -47,8 +50,10 @@ public class InnerService {
         }
         if(StringUtils.isNotBlank(param.getField())){
             wrapper.last(","+param.getField() + " "+ param.getOrder());
-        }else {
+        }else if(param.getSource() == 0) {
             wrapper.orderByDesc(Room::getCreateTime);
+        }else if(param.getSource() == 1) {
+            wrapper.orderByDesc(Room::getLastLookTime);
         }
         wrapper.orderByDesc(Room::getIsShow);
         Page<Room> page = roomService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);

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

@@ -362,7 +362,6 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             if(type == 1 ){     //加入房间,开启带看
                 roomuser.setHostStatus(0);
             }
-            roomuser.setUpdateTime(null);
             roomUserService.updateById(roomuser);
         }
 
@@ -378,7 +377,6 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             this.hostLeaveRoom(roomId,roomUserId);
         }
         room.setLastLookTime(DateUtil.formatDateTime(new Date()));
-        room.setUpdateTime(null);
         this.updateById(room);
     }