diff --git a/src/main/java/com/tailbet/controller/OpsController.java b/src/main/java/com/tailbet/controller/OpsController.java index 2ca1b91..4a4f4b4 100644 --- a/src/main/java/com/tailbet/controller/OpsController.java +++ b/src/main/java/com/tailbet/controller/OpsController.java @@ -72,7 +72,7 @@ public class OpsController { * 拉入群 */ @PostMapping("/group/pull") - public R pullGroup(@RequestBody PullGroupDTO dto) { + public R pullGroup(@Valid @RequestBody PullGroupDTO dto) { Long operatorId = UserContext.getUserId(); groupService.pullUser(dto.getGroupId(), dto.getUserId(), operatorId); return R.ok(); diff --git a/src/main/java/com/tailbet/model/dto/PullGroupDTO.java b/src/main/java/com/tailbet/model/dto/PullGroupDTO.java index 02e9129..5e8ab67 100644 --- a/src/main/java/com/tailbet/model/dto/PullGroupDTO.java +++ b/src/main/java/com/tailbet/model/dto/PullGroupDTO.java @@ -1,5 +1,6 @@ package com.tailbet.model.dto; +import jakarta.validation.constraints.NotNull; import lombok.Data; /** @@ -7,13 +8,16 @@ import lombok.Data; */ @Data public class PullGroupDTO { + /** * 用户ID */ + @NotNull(message = "用户ID不能为空") private Long userId; /** * 群ID */ + @NotNull(message = "群ID不能为空") private Long groupId; } diff --git a/src/main/java/com/tailbet/model/vo/DigitTrialVo.java b/src/main/java/com/tailbet/model/vo/DigitTrialVo.java index d78c32b..658d86f 100644 --- a/src/main/java/com/tailbet/model/vo/DigitTrialVo.java +++ b/src/main/java/com/tailbet/model/vo/DigitTrialVo.java @@ -7,9 +7,29 @@ import lombok.Data; */ @Data public class DigitTrialVo { + + /** + * 尾数(0-9) + */ private int digit; + + /** + * 玩法 + */ private String playWin; + + /** + * 总投注次数 + */ private int totalBet; + + /** + * 总奖励/赔付金额 + */ private long totalAward; + + /** + * 净盈亏(totalAward - totalBet) + */ private long profit; } diff --git a/src/main/java/com/tailbet/service/impl/GroupServiceImpl.java b/src/main/java/com/tailbet/service/impl/GroupServiceImpl.java index 8c05862..2b4606c 100644 --- a/src/main/java/com/tailbet/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/tailbet/service/impl/GroupServiceImpl.java @@ -204,6 +204,9 @@ public class GroupServiceImpl implements IGroupService { member.setUpdateTime(LocalDateTime.now()); groupMemberMapper.insert(member); + // OpenIM 侧邀请用户入群 + openIMApiClient.inviteUserToGroup(String.valueOf(groupId), List.of(String.valueOf(userId))); + // 审计日志 auditService.log(groupId, null, operatorId, "PULL_USER", String.format("{\"userId\":%d}", userId));