From 0f7c14b0e1048ac5284193f362ba10ae0791ffde Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 27 三月 2025 09:16:51 +0800 Subject: [PATCH] bug修改 --- xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/AppUserService.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/AppUserService.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/AppUserService.java index 110f63a..243e7f8 100644 --- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/AppUserService.java +++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/AppUserService.java @@ -1,18 +1,17 @@ package com.xinquan.user.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.xinquan.common.core.domain.R; +import com.xinquan.common.core.web.page.PageInfo; +import com.xinquan.system.api.domain.vo.InviteRankListVO; import com.xinquan.system.api.model.AppCaptchaBody; import com.xinquan.system.api.model.AppLoginUser; import com.xinquan.system.api.model.AppVerifyCellPhoneBody; import com.xinquan.system.api.model.AppWXLoginBody; -import com.xinquan.user.api.domain.AppUser; +import com.xinquan.system.api.domain.AppUser; import com.xinquan.user.api.domain.dto.AppUserDTO; import com.xinquan.user.domain.dto.UserAnswerDTO; -import com.xinquan.user.domain.vo.AppUserVO; +import com.xinquan.system.api.domain.vo.AppUserVO; import com.xinquan.user.domain.vo.TagVO; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import java.util.List; import java.util.Optional; @@ -36,6 +35,7 @@ * @return */ Optional<AppUser> getUserByCondition(AppUserDTO dto); + Optional<AppUser> getUserByCondition1(AppUserDTO dto); /** * app用户注册 @@ -59,7 +59,7 @@ * @param source * @return */ - AppLoginUser appleLogin(String appleId); + AppLoginUser appleLogin(String appleId,String device); /** * 验证码登录 @@ -102,7 +102,12 @@ * 获取当前登录用户信息 * * @return 用户信息 - * @see com.xinquan.user.domain.vo.AppUserVO + * @see AppUserVO */ AppUserVO getCurrentUser(); + + List<InviteRankListVO> inviteRankList(Integer pageCurr,Integer pageSize); + List<InviteRankListVO> inviteRankListNolimit(); + + } -- Gitblit v1.7.1