From 257d66798aa538f8737980f13d94c547bf0b51ea Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 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 5ccc375..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,8 +6,10 @@
 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;
 
 /**
  * <p>
@@ -57,7 +59,7 @@
 	 * @param nearbyReferrer
 	 * @return
 	 */
-	List<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer);
+	PageInfo<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer);
 
 	/**
 	 * 获取用户的祖籍列表
@@ -81,7 +83,9 @@
 	 */
 	void onlineRecord();
 
-	IPage<AppUser> getAppuserPage(Integer pageNum, Integer pageSize, AppUser appUser);
+	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);
 	
 	/**
@@ -89,4 +93,22 @@
 	 * @param appUserId
 	 */
 	void vipUpgrade(Long appUserId);
+	
+	/**
+	 * 处理用户会员降级
+	 * @param appUserId
+	 */
+	void vipDemotion(Long appUserId);
+	
+	
+	/**
+	 * 降级检测
+	 */
+	void demotionDetection();
+
+
+	/**
+	 * 定时任务关闭订单
+	 */
+	void closeOrder();
 }

--
Gitblit v1.7.1