diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java index 3df3bf80..a60c347a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java @@ -156,10 +156,10 @@ public class ChatManager { User toUser = userMap.get(userCall.getToUid()); Anchor anchor = anchorService.getByUserId(toUser.getId()); String wsSocketUrlFormat = systemConfigManager.getWebSocketUrl(); - String token = setWsToken(userCall.getId(), fromUser.getId(), toUser.getId(), userId); - String weSocketUrl = String.format(wsSocketUrlFormat,token,roomId); + String token = setWsToken(room.getRoomId(), fromUser.getId(), toUser.getId(), userId); + String weSocketUrl = String.format(wsSocketUrlFormat,token,room.getRoomId()); GetRoomResp getRoomResp = new GetRoomResp(); - getRoomResp.setRoomId(userCall.getId()+""); + getRoomResp.setRoomId(room.getRoomId()+""); getRoomResp.setFromUid(userCall.getFromUid()); getRoomResp.setFromNickname(fromUser.getNickname()); getRoomResp.setFromAvatar(fromUser.getAvatar()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java index dd4b9bde..667bdbce 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java @@ -18,6 +18,7 @@ import com.ruoyi.cai.manager.IdManager; import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.mapper.AccountMapper; import com.ruoyi.cai.service.*; +import com.ruoyi.cai.util.CaiDateUtil; import com.ruoyi.cai.util.CaiNumUtil; import com.ruoyi.cai.ws.bean.Room; import com.ruoyi.cai.ws.bean.RoomData; @@ -32,6 +33,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * 用户账户Service业务层处理 @@ -402,8 +404,8 @@ public class AccountServiceImpl extends ServiceImpl impl userCallService.update(Wrappers.lambdaUpdate(UserCall.class) .eq(UserCall::getId, userCall.getId()) .set(UserCall::getTraceId,tractId) - .set(UserCall::getBeginTime, DateUtil.date(roomData.getBeginTime()).toLocalDateTime()) - .set(UserCall::getEndTime,DateUtil.date(roomData.getHangupTime()).toLocalDateTime()) + .set(UserCall::getBeginTime, CaiDateUtil.toDataSecond(roomData.getBeginTime())) + .set(UserCall::getEndTime, CaiDateUtil.toDataSecond(roomData.getBeginTime())) .set(UserCall::getCallTime,roomData.getHangupTime() - roomData.getBeginTime()) .set(UserCall::getCallAmount,amountReal) .set(UserCall::getCallIncome, anchorAmount) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/util/CaiDateUtil.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/util/CaiDateUtil.java index 13607e52..76fdd10a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/util/CaiDateUtil.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/util/CaiDateUtil.java @@ -1,6 +1,8 @@ package com.ruoyi.cai.util; +import cn.hutool.core.date.DateUtil; + import java.time.DayOfWeek; import java.time.LocalDate; import java.time.LocalDateTime; @@ -19,6 +21,14 @@ public class CaiDateUtil { return localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); } + public static LocalDateTime toDataSecond(Long date){ + if(date == null){ + return null; + } + return DateUtil.date(date*1000).toLocalDateTime(); + } + + public static void main(String[] args) { LocalDate one = getLastWeekOne(LocalDate.now()); System.out.println(one.format(DateTimeFormatter.ofPattern("yyyyMMdd")));