From 74b2581c8a9be309ca6454da3ff2c56501368771 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 09 一月 2025 09:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java |   15 ++++++++++++++-
 1 files changed, 14 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 5ccc375..05a32bd 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
@@ -8,6 +8,7 @@
 import com.ruoyi.common.core.web.domain.AjaxResult;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -81,7 +82,7 @@
 	 */
 	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 +90,16 @@
 	 * @param appUserId
 	 */
 	void vipUpgrade(Long appUserId);
+	
+	
+	/**
+	 * 降级检测
+	 */
+	void demotionDetection();
+
+
+	/**
+	 * 定时任务关闭订单
+	 */
+	void closeOrder();
 }

--
Gitblit v1.7.1