diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCall.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCall.java index a1b9a20d..78853ed9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCall.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCall.java @@ -79,31 +79,10 @@ public class UserCall implements Serializable { * 接收者-视频比例 */ private BigDecimal receiverVideoDivide; - /** - * 接收者-工会会长 - */ - private Long receiverUnionUserId; - /** - * 接收者-工会-视频比例 - */ - private BigDecimal receiverUnionVideoDivide; - private Boolean receiverUnionGet; - private Boolean receiverInviteGet; - /** - * 接收者-邀请人 - */ - private Long receiverInviteUserId; - /** - * 接收者-邀请人-奖励比例 - */ - private BigDecimal receiverIncomeDivide; - /** - * 拨打者支付-邀请人-奖励比例 - */ - private BigDecimal callerPayDivide; /** * 免费通话时长(分钟) */ + @Deprecated private Integer freeNum; private LocalDateTime createTime; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCallServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCallServiceImpl.java index 6bd0ed32..6f26020f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCallServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCallServiceImpl.java @@ -50,16 +50,6 @@ public class UserCallServiceImpl extends ServiceImpl i userCall.setToUid(toUser.getId()); userCall.setCallPrice(anchor.getPrice()); userCall.setReceiverVideoDivide(anchor.getVideoRate()); - UnionUser unionUser = unionUserService.getByUserId(toUser.getId()); - if(unionUser != null && unionUser.getEnableRate()){ - userCall.setReceiverUnionUserId(unionUser.getUserId()); - userCall.setReceiverUnionVideoDivide(unionUser.getVideoDivide()); - } - UserInvite invite = inviteService.getByUserId(toUser.getId()); - if(invite != null){ - userCall.setReceiverInviteUserId(invite.getInviteId()); -// userCall.setReceiverIncomeDivide(invite.getVideoIncomeRate()); - } boolean save = this.save(userCall); if(!save){ throw new ServiceException("添加通话失败!"); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/bean/UserData.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/bean/UserData.java index e89723cd..fe43b36b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/bean/UserData.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/bean/UserData.java @@ -11,13 +11,5 @@ public class UserData { private int userType; private String nickname; private String userCode; - private Long inviterId; - private BigDecimal inviterRate; - private Boolean inviterIsGet; - - private Long unionUserId; - private BigDecimal unionUserRate; - private Boolean unionIsGet; - private Long connectTime; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java index 3fcf363a..180ab810 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java @@ -121,12 +121,6 @@ public class WebSocketManager { receiveUserData.setRoomId(call.getId()); receiveUserData.setNickname(receiverUser.getNickname()); receiveUserData.setUserCode(receiverUser.getUsercode()); - receiveUserData.setInviterId(call.getReceiverInviteUserId()); - receiveUserData.setInviterRate(call.getReceiverIncomeDivide()); - receiveUserData.setInviterIsGet(call.getReceiverInviteGet()); - receiveUserData.setUnionUserId(call.getReceiverUnionUserId()); - receiveUserData.setUnionUserRate(call.getReceiverUnionVideoDivide()); - receiveUserData.setUnionIsGet(call.getReceiverUnionGet()); userDataCache.initReceiver(callerUserData); callerRoomCache.addRoom(call.getFromUid(),call.getToUid(),call.getId()); return call.getId();