From fd45fcbd496bbeaf9ee18edd8f2f858cf9cebaf3 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 24 一月 2025 16:47:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java index 05a32bd..f0671a0 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java @@ -6,6 +6,7 @@ import com.ruoyi.account.vo.*; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.PageInfo; import java.util.List; import java.util.Set; @@ -58,7 +59,7 @@ * @param nearbyReferrer * @return */ - List<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer); + PageInfo<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer); /** * 获取用户的祖籍列表 @@ -83,6 +84,8 @@ void onlineRecord(); IPage<AppUser> getAppuserPage(Integer pageNum, Integer pageSize, AppUser appUser, Integer shopId, Set<Long> userId); + + IPage<AppUser> getAppuserPage1(Integer pageNum, Integer pageSize, AppUser appUser,Integer objectId,List<Long> userIds); /** @@ -91,6 +94,12 @@ */ void vipUpgrade(Long appUserId); + /** + * 处理用户会员降级 + * @param appUserId + */ + void vipDemotion(Long appUserId); + /** * 降级检测 -- Gitblit v1.7.1