shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-01-10 09:47:21 +08:00
parent 5bd8ba90bc
commit acccdc9f79
4 changed files with 1 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserCall.java
View File

@@ -79,31 +79,10 @@ public class UserCall implements Serializable {
* 接收者-视频比例 * 接收者-视频比例
*/ */
private BigDecimal receiverVideoDivide; 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 Integer freeNum;
private LocalDateTime createTime; private LocalDateTime createTime;

10
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserCallServiceImpl.java
View File

@@ -50,16 +50,6 @@ public class UserCallServiceImpl extends ServiceImpl<UserCallMapper, UserCall> i
userCall.setToUid(toUser.getId()); userCall.setToUid(toUser.getId());
userCall.setCallPrice(anchor.getPrice()); userCall.setCallPrice(anchor.getPrice());
userCall.setReceiverVideoDivide(anchor.getVideoRate()); 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); boolean save = this.save(userCall);
if(!save){ if(!save){
throw new ServiceException("添加通话失败!"); throw new ServiceException("添加通话失败!");

8
ruoyi-cai/src/main/java/com/ruoyi/cai/ws/bean/UserData.java
View File

@@ -11,13 +11,5 @@ public class UserData {
private int userType; private int userType;
private String nickname; private String nickname;
private String userCode; private String userCode;
private Long inviterId;
private BigDecimal inviterRate;
private Boolean inviterIsGet;
private Long unionUserId;
private BigDecimal unionUserRate;
private Boolean unionIsGet;
private Long connectTime; private Long connectTime;
} }

6
ruoyi-cai/src/main/java/com/ruoyi/cai/ws/manager/WebSocketManager.java
View File

@@ -121,12 +121,6 @@ public class WebSocketManager {
receiveUserData.setRoomId(call.getId()); receiveUserData.setRoomId(call.getId());
receiveUserData.setNickname(receiverUser.getNickname()); receiveUserData.setNickname(receiverUser.getNickname());
receiveUserData.setUserCode(receiverUser.getUsercode()); 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); userDataCache.initReceiver(callerUserData);
callerRoomCache.addRoom(call.getFromUid(),call.getToUid(),call.getId()); callerRoomCache.addRoom(call.getFromUid(),call.getToUid(),call.getId());
return call.getId(); return call.getId();