1

src/main/java/com/fdkankan/tk/response/RoomListDataVo.java

@@ -31,8 +31,8 @@ public class RoomListDataVo {
     @ExcelProperty("房间状态")
     private String roomStatusStr;
 
-    @ExcelProperty("总观看人数")
-    private Long lookManCount;
+    @ExcelProperty("总观看次数")
+    private Integer lookManCount;
 
     @ExcelProperty("分享总数")
     private Integer shareCount;

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

@@ -220,9 +220,9 @@ public class DataCountService {
             list.forEach(entity -> sceneMap.put(entity.getNum(),entity));
         }
 
-        List<DataCount> roomList = roomVisitLogService.getGroupByRoomId();
-        HashMap<String,Long> roomManMap = new HashMap<>();
-        roomList.forEach(entity -> roomManMap.put(entity.getDataKey(),entity.getDataCount()));
+//        List<DataCount> roomList = roomVisitLogService.getGroupByRoomId();
+//        HashMap<String,Long> roomManMap = new HashMap<>();
+//        roomList.forEach(entity -> roomManMap.put(entity.getDataKey(),entity.getDataCount()));
 
         for (Room record : page.getRecords()) {
             List<RoomNum> roomNums = numRoomMap.get(record.getRoomId());
@@ -250,7 +250,7 @@ public class DataCountService {
             roomListDataVo.setCreateTime(record.getCreateTime());
             roomListDataVo.setRoomStatus(record.getRoomStatus());
             roomListDataVo.setLookTime(minute);
-            roomListDataVo.setLookManCount(roomManMap.get(record.getRoomId()) == null ? 0L:roomManMap.get(record.getRoomId()) );
+            roomListDataVo.setLookManCount(record.getRoomViewCount());
             roomListDataVo.setShareCount(record.getShareCount());
             voList.add(roomListDataVo);
         }

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

@@ -316,7 +316,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     public void inOrOutRoom(String roomId, String role, Integer type,String userId) {
         //log.info("inOrOutRoom--roomId:{},role:{},type:{},userId:{}",roomId,role,type,userId);
         if(roomId == null || StringUtils.isBlank(role)
-                || ( !role.equals("leader") && !role.equals("follower")) ){
+                || ( !role.equals("leader") && !role.equals("customer")) ){
             throw new BusinessException(ResultCode.PARAM_MISS);
         }
         String wxRoomId = roomId;
@@ -339,7 +339,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             throw new BusinessException(ResultCode.ROOM_END_EX);
         }
 
-        if(role.equals("follower")){
+        if(role.equals("customer")){
             if(type == 0 ){
                 room.setRoomViewCount(room.getRoomViewCount() + 1);
             }