diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java index fe669493..a336b692 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java @@ -6,8 +6,8 @@ import com.ruoyi.cai.dto.app.query.AnchorListQuery; import com.ruoyi.cai.dto.app.query.UserQuery; import com.ruoyi.cai.dto.app.vo.AnchorListVo; import com.ruoyi.cai.dto.app.vo.IndexBannerVo; -import com.ruoyi.cai.dto.app.vo.UserInfoVo; -import com.ruoyi.cai.dto.app.vo.UserListVo; +import com.ruoyi.cai.dto.app.vo.user.UserInfoVo; +import com.ruoyi.cai.dto.app.vo.user.UserListVo; import com.ruoyi.cai.dto.app.vo.index.GuardListPageVo; import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo; import com.ruoyi.cai.service.*; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java new file mode 100644 index 00000000..61a96821 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java @@ -0,0 +1,44 @@ +package com.ruoyi.cai.controller.app; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo; +import com.ruoyi.cai.dto.app.vo.user.UserListVo; +import com.ruoyi.cai.service.CaiUserInviteService; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.helper.LoginHelper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/api/invite") +@Tag(name = "邀请相关接口") +public class InviteAppController { + + @Autowired + private CaiUserInviteService userInviteService; + + @GetMapping("/home") + @Operation(summary = "邀请有奖页面") + public R inviteHome(){ + Long userId = LoginHelper.getUserId(); + InviteHomeVo inviteHome = userInviteService.inviteHome(userId); + return R.ok(inviteHome); + } + + @GetMapping("/user/page") + @Operation(summary = "我邀请的人") + public TableDataInfo inviteUserPage(PageQuery pageQuery){ + Long userId = LoginHelper.getUserId(); + Page userPage = userInviteService.inviteUserPage(pageQuery,userId); + return TableDataInfo.build(userPage); + } + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java index 0d500279..2bbc6920 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java @@ -8,7 +8,7 @@ import com.ruoyi.cai.dto.app.query.*; import com.ruoyi.cai.dto.app.vo.AccountCashVo; import com.ruoyi.cai.dto.app.vo.AccountRechargeVo; import com.ruoyi.cai.dto.app.vo.CurrentUserInfoVo; -import com.ruoyi.cai.dto.app.vo.UserAccountVo; +import com.ruoyi.cai.dto.app.vo.user.UserAccountVo; import com.ruoyi.cai.manager.CurrentUserManager; import com.ruoyi.cai.service.CaiAccountCashService; import com.ruoyi.cai.service.CaiAccountRechargeService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java index e7073dd9..a5105f03 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; import com.ruoyi.cai.dto.app.query.StarQuery; -import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; +import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; import com.ruoyi.cai.service.CaiUserFollowService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java index ad37aa36..3dc5f199 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java @@ -3,7 +3,7 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; import com.ruoyi.cai.dto.app.query.VisitorQuery; -import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; +import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; import com.ruoyi.cai.service.CaiUserVisitorService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/dto/InviteCountDTO.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/dto/InviteCountDTO.java new file mode 100644 index 00000000..b6068c2c --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/dto/InviteCountDTO.java @@ -0,0 +1,9 @@ +package com.ruoyi.cai.dto.app.dto; + +import lombok.Data; + +@Data +public class InviteCountDTO { + private Long totalReward; + private Long totalInvite; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/CurrentUserInfoVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/CurrentUserInfoVo.java index b84333c3..2289224e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/CurrentUserInfoVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/CurrentUserInfoVo.java @@ -1,10 +1,12 @@ package com.ruoyi.cai.dto.app.vo; +import com.ruoyi.cai.dto.app.vo.user.UserAccountVo; +import com.ruoyi.cai.dto.app.vo.user.UserAlbumDTO; +import com.ruoyi.cai.dto.app.vo.user.UserCountVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.List; @Data diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/invite/InviteHomeVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/invite/InviteHomeVo.java new file mode 100644 index 00000000..82c5d832 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/invite/InviteHomeVo.java @@ -0,0 +1,12 @@ +package com.ruoyi.cai.dto.app.vo.invite; + +import lombok.Data; + +import java.util.List; + +@Data +public class InviteHomeVo { + private List reward; + private Long totalReward; + private Long totalInvite; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserAccountVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAccountVo.java similarity index 93% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserAccountVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAccountVo.java index dc028270..13ce3bfc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserAccountVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAccountVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.dto.app.vo; +package com.ruoyi.cai.dto.app.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserAlbumDTO.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAlbumDTO.java similarity index 96% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserAlbumDTO.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAlbumDTO.java index b5e8ccf3..6cf02252 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserAlbumDTO.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserAlbumDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.dto.app.vo; +package com.ruoyi.cai.dto.app.vo.user; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserBaseVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserBaseVo.java similarity index 94% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserBaseVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserBaseVo.java index a84b5370..7754df1d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserBaseVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserBaseVo.java @@ -1,5 +1,5 @@ -package com.ruoyi.cai.dto.app.vo; +package com.ruoyi.cai.dto.app.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserCountVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserCountVo.java similarity index 93% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserCountVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserCountVo.java index 972ddccb..5f483a8e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserCountVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserCountVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.dto.app.vo; +package com.ruoyi.cai.dto.app.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserInfoVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserInfoVo.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserInfoVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserInfoVo.java index b9a1c2d4..cd83e2a7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserInfoVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserInfoVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.dto.app.vo; +package com.ruoyi.cai.dto.app.vo.user; import com.ruoyi.cai.dto.app.vo.index.GuardIndexVo; import com.ruoyi.cai.dto.app.vo.index.UserGiftIndexVo; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserListVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserListVo.java similarity index 84% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserListVo.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserListVo.java index ed854fa5..b0f79d3e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserListVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserListVo.java @@ -1,10 +1,9 @@ -package com.ruoyi.cai.dto.app.vo; +package com.ruoyi.cai.dto.app.vo.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.math.BigDecimal; import java.time.LocalDateTime; @Data diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserStarOrVisitorList.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserStarOrVisitorList.java similarity index 81% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserStarOrVisitorList.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserStarOrVisitorList.java index fd5680f5..628d69e3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/UserStarOrVisitorList.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserStarOrVisitorList.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.dto.app.vo; +package com.ruoyi.cai.dto.app.vo.user; import lombok.Data; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java index 3f8e2009..6c16392c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java @@ -7,6 +7,9 @@ import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes; import com.ruoyi.cai.dto.app.query.AnchorUpdateReq; import com.ruoyi.cai.dto.app.query.UserUpdateReq; import com.ruoyi.cai.dto.app.vo.*; +import com.ruoyi.cai.dto.app.vo.user.UserAccountVo; +import com.ruoyi.cai.dto.app.vo.user.UserAlbumDTO; +import com.ruoyi.cai.dto.app.vo.user.UserCountVo; import com.ruoyi.cai.service.*; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.BeanConvertUtil; @@ -40,7 +43,7 @@ public class CurrentUserManager { CaiUserCount userCount = userCountService.getByUserId(userId); res.setUserCount(BeanConvertUtil.convertTo(userCount, UserCountVo::new)); CaiAccount account = accountService.getByUserId(userId); - res.setUserAccount(BeanConvertUtil.convertTo(account,UserAccountVo::new)); + res.setUserAccount(BeanConvertUtil.convertTo(account, UserAccountVo::new)); List userAlbums = userAlbumService.listByUserId(userId); res.setUserAlbumList(BeanConvertUtil.convertListTo(userAlbums, UserAlbumDTO::new)); return res; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowMapper.java index 2926f80e..4991be29 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserFollowMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.CaiUserFollow; import com.ruoyi.cai.dto.app.query.StarQuery; -import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; +import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; import org.apache.ibatis.annotations.Param; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInviteMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInviteMapper.java index 74223bc1..4557b70f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInviteMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserInviteMapper.java @@ -1,7 +1,11 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.CaiUserInvite; +import com.ruoyi.cai.dto.app.dto.InviteCountDTO; +import com.ruoyi.cai.dto.app.vo.user.UserListVo; +import org.apache.ibatis.annotations.Param; /** * 用户邀请Mapper接口 @@ -11,4 +15,7 @@ import com.ruoyi.cai.domain.CaiUserInvite; */ public interface CaiUserInviteMapper extends BaseMapper { + InviteCountDTO countInviteAndReward(@Param("userId") Long userId); + + Page inviteUserPage(@Param("build") Page build, @Param("userId") Long userId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMapper.java index 7d493d63..71419d13 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.CaiUser; import com.ruoyi.cai.dto.admin.vo.CaiUserAdminVo; import com.ruoyi.cai.dto.app.query.UserQuery; -import com.ruoyi.cai.dto.app.vo.UserListVo; +import com.ruoyi.cai.dto.app.vo.user.UserListVo; import org.apache.ibatis.annotations.Param; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserVisitorMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserVisitorMapper.java index 97082dad..8b3cb335 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserVisitorMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserVisitorMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.CaiUserVisitor; import com.ruoyi.cai.dto.app.query.VisitorQuery; -import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; +import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; import org.apache.ibatis.annotations.Param; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java index 41c2127c..450206ac 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserAlbumService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiUserAlbum; import com.ruoyi.cai.dto.app.query.AlbumAddReq; import com.ruoyi.cai.dto.app.query.AlbumResetReq; -import com.ruoyi.cai.dto.app.vo.UserAlbumDTO; import java.util.List; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java index 70795e10..73b1907d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserFollowService.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiUserFollow; import com.ruoyi.cai.dto.app.query.StarQuery; import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; -import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; +import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; import com.ruoyi.common.core.domain.PageQuery; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInviteService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInviteService.java index 15f1e732..eb0c2e85 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInviteService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserInviteService.java @@ -1,7 +1,11 @@ package com.ruoyi.cai.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiUserInvite; +import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo; +import com.ruoyi.cai.dto.app.vo.user.UserListVo; +import com.ruoyi.common.core.domain.PageQuery; /** * 用户邀请Service接口 @@ -12,4 +16,8 @@ import com.ruoyi.cai.domain.CaiUserInvite; public interface CaiUserInviteService extends IService { CaiUserInvite getByUserId(Long id); + + InviteHomeVo inviteHome(Long userId); + + Page inviteUserPage(PageQuery pageQuery, Long userId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserService.java index e0990cc4..f2ed431f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserService.java @@ -6,8 +6,8 @@ import com.ruoyi.cai.auth.LoginCaiUser; import com.ruoyi.cai.domain.CaiUser; import com.ruoyi.cai.dto.admin.vo.CaiUserAdminVo; import com.ruoyi.cai.dto.app.query.UserQuery; -import com.ruoyi.cai.dto.app.vo.UserInfoVo; -import com.ruoyi.cai.dto.app.vo.UserListVo; +import com.ruoyi.cai.dto.app.vo.user.UserInfoVo; +import com.ruoyi.cai.dto.app.vo.user.UserListVo; import com.ruoyi.common.core.domain.PageQuery; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java index 8e853c94..f1fbd45e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserVisitorService.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiUserVisitor; import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; import com.ruoyi.cai.dto.app.query.VisitorQuery; -import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; +import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; import com.ruoyi.common.core.domain.PageQuery; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java index e94d78a5..46fd8343 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserAlbumServiceImpl.java @@ -7,11 +7,9 @@ import com.ruoyi.cai.domain.CaiUser; import com.ruoyi.cai.domain.CaiUserAlbum; import com.ruoyi.cai.dto.app.query.AlbumAddReq; import com.ruoyi.cai.dto.app.query.AlbumResetReq; -import com.ruoyi.cai.dto.app.vo.UserAlbumDTO; import com.ruoyi.cai.mapper.CaiUserAlbumMapper; import com.ruoyi.cai.service.CaiUserAlbumService; import com.ruoyi.cai.service.CaiUserService; -import com.ruoyi.common.helper.LoginHelper; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowServiceImpl.java index fe116771..dd771759 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserFollowServiceImpl.java @@ -7,7 +7,7 @@ import com.ruoyi.cai.domain.CaiUserCount; import com.ruoyi.cai.domain.CaiUserFollow; import com.ruoyi.cai.dto.app.query.StarQuery; import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; -import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; +import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; import com.ruoyi.cai.mapper.CaiUserFollowMapper; import com.ruoyi.cai.service.CaiUserCountService; import com.ruoyi.cai.service.CaiUserFollowService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInviteServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInviteServiceImpl.java index 0b00bcb4..ebb2ddd8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInviteServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserInviteServiceImpl.java @@ -1,12 +1,23 @@ package com.ruoyi.cai.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.cai.domain.CaiUser; import com.ruoyi.cai.domain.CaiUserInvite; +import com.ruoyi.cai.dto.app.dto.InviteCountDTO; +import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo; +import com.ruoyi.cai.dto.app.vo.user.UserListVo; import com.ruoyi.cai.mapper.CaiUserInviteMapper; import com.ruoyi.cai.service.CaiUserInviteService; +import com.ruoyi.cai.service.CaiUserService; +import com.ruoyi.common.core.domain.PageQuery; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * 用户邀请Service业务层处理 * @@ -15,8 +26,34 @@ import org.springframework.stereotype.Service; */ @Service public class CaiUserInviteServiceImpl extends ServiceImpl implements CaiUserInviteService { + @Override public CaiUserInvite getByUserId(Long id) { return this.getOne(Wrappers.lambdaQuery(CaiUserInvite.class).eq(CaiUserInvite::getUserId,id).last("limit 1")); } + + @Autowired + private CaiUserService userService; + + @Override + public InviteHomeVo inviteHome(Long userId) { + InviteHomeVo vo = new InviteHomeVo(); + List reward = new ArrayList<>(); + reward.add("1、邀请主播认证通过奖励#300#紫贝"); + reward.add("2、邀请用户首次充值奖励#1200#紫贝"); + reward.add("3、主播视频、礼物、会员分成#50%#"); + reward.add("4、邀请男用户充值提成#30%#"); + reward.add("5、邀请主播收益#7%#"); + reward.add("最终解释权归平台所有"); + vo.setReward(reward); + InviteCountDTO inviteCount = baseMapper.countInviteAndReward(userId); + vo.setTotalInvite(inviteCount.getTotalInvite()); + vo.setTotalReward(inviteCount.getTotalReward()); + return null; + } + + @Override + public Page inviteUserPage(PageQuery pageQuery, Long userId) { + return baseMapper.inviteUserPage(pageQuery.build(),userId); + } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserServiceImpl.java index d36567a6..3c470b16 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserServiceImpl.java @@ -8,8 +8,8 @@ import com.ruoyi.cai.domain.CaiAnchor; import com.ruoyi.cai.domain.CaiUser; import com.ruoyi.cai.dto.admin.vo.CaiUserAdminVo; import com.ruoyi.cai.dto.app.query.UserQuery; -import com.ruoyi.cai.dto.app.vo.UserInfoVo; -import com.ruoyi.cai.dto.app.vo.UserListVo; +import com.ruoyi.cai.dto.app.vo.user.UserInfoVo; +import com.ruoyi.cai.dto.app.vo.user.UserListVo; import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo; import com.ruoyi.cai.mapper.CaiUserMapper; import com.ruoyi.cai.service.*; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java index 178f7414..502bedbc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserVisitorServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.CaiUserVisitor; import com.ruoyi.cai.dto.app.query.StarOrVisitorReq; import com.ruoyi.cai.dto.app.query.VisitorQuery; -import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; +import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList; import com.ruoyi.cai.mapper.CaiUserVisitorMapper; import com.ruoyi.cai.service.CaiUserCountService; import com.ruoyi.cai.service.CaiUserVisitorService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/util/AES.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/util/AES.java index a273a621..308cf41c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/util/AES.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/util/AES.java @@ -8,7 +8,7 @@ import java.util.Base64; public class AES { public static void main(String[] args) throws Exception { - String jsonData ="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"; // 要加密的JSON 数据 + String jsonData ="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"; // String jsonData = "123"; String key = "K2AwvosrwtoAgOEP"; String encod = encrypt(jsonData, key); diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowMapper.xml index 2c1957ba..268f0d96 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserFollowMapper.xml @@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select t1.create_time as happen_time,t1.is_watch, t2.avatar,t2.gender,t2.city,t2.nickname,t2.usercode,t2.age diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserInviteMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserInviteMapper.xml index ef2ab69f..0e3d79db 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserInviteMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserInviteMapper.xml @@ -8,12 +8,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - + + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMapper.xml index 19d84f56..dca7e28e 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMapper.xml @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from cai_user t1 left join cai_user_info t2 on t1.id = t2.user_id - select t1.avatar,t1.gender,t1.city,t1.nickname,t1.usercode,t1.age,t2.last_live_time from cai_user t1 join cai_user_online t2 on t1.id = t2.user_id diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserVisitorMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserVisitorMapper.xml index deed66c8..6be7e85d 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserVisitorMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserVisitorMapper.xml @@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select t1.create_time as happen_time,t1.is_watch, t2.avatar,t2.gender,t2.city,t2.nickname,t2.usercode,t2.age