From 572df690f72ed4a077d934823f261dec39b3cc7d Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 08 九月 2026 17:11:34 +0800
Subject: [PATCH] feat&bug：文档内容修改
---
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 14 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index e33eafd..0f07197 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -57,6 +57,22 @@
private CoursePackageClient coursePackageClient;
/**
+ * 注销账号保留业务记录，但不计入后台累计用户、累计学员统计。
+ */
+ private List<Integer> getActiveUserIds(List<Integer> ids) {
+ if (ids == null || ids.isEmpty()) {
+ return Collections.singletonList(-1);
+ }
+ List<Integer> activeUserIds = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .in(TAppUser::getId, ids)
+ .ne(TAppUser::getState, 3))
+ .stream()
+ .map(TAppUser::getId)
+ .collect(Collectors.toList());
+ return activeUserIds.isEmpty() ? Collections.singletonList(-1) : activeUserIds;
+ }
+
+ /**
* 查询玩湃惠民卡绑定学员列表信息
*
* @return
@@ -353,35 +369,49 @@
if (ids.size() == 0) {
ids.add(-1);
}
- List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1));
+ List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .eq(TAppUser::getInsertType, 1)
+ .ne(TAppUser::getState, 3));
return list.stream().map(TAppUser::getId).collect(Collectors.toList());
}
@PostMapping("/student/getUserYYs")
@ResponseBody
public List<Integer> getUserYYs(@RequestBody Integer id) {
- List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 2).eq(TAppUser::getAddUserId, id));
+ List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .eq(TAppUser::getInsertType, 2)
+ .eq(TAppUser::getAddUserId, id)
+ .ne(TAppUser::getState, 3));
return list.stream().map(TAppUser::getId).collect(Collectors.toList());
}
@PostMapping("/student/getUserStore")
@ResponseBody
public List<Integer> getUserStore(@RequestBody Integer id) {
- List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 3).eq(TAppUser::getAddUserId, id));
+ List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .eq(TAppUser::getInsertType, 3)
+ .eq(TAppUser::getAddUserId, id)
+ .ne(TAppUser::getState, 3));
return list.stream().map(TAppUser::getId).collect(Collectors.toList());
}
@PostMapping("/student/getUserYys")
@ResponseBody
public List<Integer> getUserYys(@RequestBody Integer id) {
- List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 2).eq(TAppUser::getAddUserId, id));
+ List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .eq(TAppUser::getInsertType, 2)
+ .eq(TAppUser::getAddUserId, id)
+ .ne(TAppUser::getState, 3));
return list.stream().map(TAppUser::getId).collect(Collectors.toList());
}
@ResponseBody
@PostMapping("/student/getUserPtVip")
public List<Integer> getUserPtVip() {
- List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1).eq(TAppUser::getIsVip, 1));
+ List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .eq(TAppUser::getInsertType, 1)
+ .eq(TAppUser::getIsVip, 1)
+ .ne(TAppUser::getState, 3));
return list.stream().map(TAppUser::getId).collect(Collectors.toList());
}
@@ -391,9 +421,14 @@
public HashMap<String, Object> userAndVipPt(@RequestBody Integer type) {
HashMap<String, Object> map = new HashMap<>();
// 所有的
- List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1));
+ List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .eq(TAppUser::getInsertType, 1)
+ .ne(TAppUser::getState, 3));
map.put("allUser", list.size());
- List<TAppUser> list1 = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1).eq(TAppUser::getIsVip, 1));
+ List<TAppUser> list1 = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .eq(TAppUser::getInsertType, 1)
+ .eq(TAppUser::getIsVip, 1)
+ .ne(TAppUser::getState, 3));
map.put("allVip", list1.size());
@@ -500,7 +535,9 @@
public HashMap<String, Object> stuPt() {
HashMap<String, Object> map = new HashMap<>();
// 所有的
- List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1));
+ List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .eq(TAppUser::getInsertType, 1)
+ .ne(TAppUser::getState, 3));
List<Integer> collect1 = list.stream().map(TAppUser::getId).collect(Collectors.toList());
if (collect1.size() == 0) {
collect1.add(-1);
@@ -593,7 +630,8 @@
@PostMapping("/student/stuYys")
public HashMap<String, Object> stuYys(@RequestBody List<Integer> ids) {
HashMap<String, Object> map = new HashMap<>();
- List<TStudent> students = studentService.list(new LambdaQueryWrapper<TStudent>().in(TStudent::getAppUserId, ids));
+ List<Integer> activeUserIds = getActiveUserIds(ids);
+ List<TStudent> students = studentService.list(new LambdaQueryWrapper<TStudent>().in(TStudent::getAppUserId, activeUserIds));
map.put("allUser", students.size());
ArrayList<Object> integers = new ArrayList<>();
@@ -697,7 +735,8 @@
public HashMap<String, Object> stuStores(@RequestBody List<Integer> ids) {
HashMap<String, Object> map = new HashMap<>();
- List<TStudent> students = studentService.list(new LambdaQueryWrapper<TStudent>().in(TStudent::getAppUserId, ids));
+ List<Integer> activeUserIds = getActiveUserIds(ids);
+ List<TStudent> students = studentService.list(new LambdaQueryWrapper<TStudent>().in(TStudent::getAppUserId, activeUserIds));
map.put("allUser", students.size());
ArrayList<Object> integers = new ArrayList<>();
@@ -799,9 +838,14 @@
HashMap<String, Object> map = new HashMap<>();
// 所有的
- List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids));
+ List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .in(TAppUser::getId, ids)
+ .ne(TAppUser::getState, 3));
map.put("allUser", list.size());
- List<TAppUser> list1 = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids).eq(TAppUser::getIsVip, 1));
+ List<TAppUser> list1 = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .in(TAppUser::getId, ids)
+ .eq(TAppUser::getIsVip, 1)
+ .ne(TAppUser::getState, 3));
map.put("allVip", list1.size());
@@ -907,9 +951,14 @@
public HashMap<String, Object> userAndVipStore(@RequestBody List<Integer> ids) {
HashMap<String, Object> map = new HashMap<>();
// 所有的
- List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids));
+ List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .in(TAppUser::getId, ids)
+ .ne(TAppUser::getState, 3));
map.put("allUser", list.size());
- List<TAppUser> list1 = appUserService.list(new LambdaQueryWrapper<TAppUser>().in(TAppUser::getId, ids).eq(TAppUser::getIsVip, 1));
+ List<TAppUser> list1 = appUserService.list(new LambdaQueryWrapper<TAppUser>()
+ .in(TAppUser::getId, ids)
+ .eq(TAppUser::getIsVip, 1)
+ .ne(TAppUser::getState, 3));
map.put("allVip", list1.size());
--
Gitblit v1.7.1