From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java | 109 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 42 deletions(-)
diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
index 0a08aca..6c730a5 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
@@ -16,6 +16,7 @@
import com.xinquan.common.core.utils.page.CollUtils;
import com.xinquan.common.core.utils.page.PageDTO;
import com.xinquan.common.core.web.domain.BaseModel;
+import com.xinquan.common.core.web.page.PageInfo;
import com.xinquan.common.log.annotation.Log;
import com.xinquan.common.log.enums.BusinessType;
import com.xinquan.common.redis.service.RedisService;
@@ -128,7 +129,26 @@
private NoticeRecordService noticeRecordService;
@Resource
private AppUserBlackService appUserBlackService;
-
+ /**
+ * 远程调用 保存邀请码
+ */
+ @PostMapping("/saveQrCode")
+ public R saveQrCode(@RequestBody AppUser appUser){
+ appUserService.updateById(appUser);
+ return R.ok();
+ }
+ /**
+ * 远程调用 查询用户信息
+ */
+ @GetMapping("/getUserById/{id}")
+ public R<AppUser> getUserById(@PathVariable("id") Long id){
+ AppUser byId = appUserService.getById(id);
+ if (byId==null){
+ return R.fail();
+ }else{
+ return R.ok(byId);
+ }
+ }
/**
* 远程调用 查询当前登陆人拉黑列表
* @param appUserId
@@ -1185,7 +1205,7 @@
byId.setUserStatus(3);
byId.setLogoutTime(LocalDateTime.now());
appUserService.updateById(byId);
- appUserService.removeById(byId);
+// appUserService.removeById(byId);
remoteUserService.removeByAppUserId(byId.getUserId());
return R.ok();
}
@@ -1251,9 +1271,14 @@
.list();
// 查询登录用户邀请了哪些人
List<Long> collect = page.stream().map(AppUser::getId).collect(Collectors.toList());
+ List<AppUserWalletRecord> list1 = appUserWalletRecordService.lambdaQuery().list();
for (AppUser record : page) {
- List<AppUserWalletRecord> list = appUserWalletRecordService.lambdaQuery().eq(AppUserWalletRecord::getAppUserId, userId)
- .like(AppUserWalletRecord::getReason,"分佣").eq(AppUserWalletRecord::getChildAppUserId, record.getId()).list();
+ List<AppUserWalletRecord> list = list1.stream().filter(e -> e.getAppUserId().equals(userId) && e.getReason().contains("分佣")
+ && e.getChildAppUserId().equals(record.getId())
+ ).collect(Collectors.toList());
+
+// List<AppUserWalletRecord> list = appUserWalletRecordService.lambdaQuery().eq(AppUserWalletRecord::getAppUserId, userId)
+// .like(AppUserWalletRecord::getReason,"分佣").eq(AppUserWalletRecord::getChildAppUserId, record.getId()).list();
BigDecimal reduce = list.stream().map(AppUserWalletRecord::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
record.setMoney(reduce);
}
@@ -1282,9 +1307,17 @@
.list();
// 查询登录用户邀请了哪些人
List<Long> collect = page.stream().map(AppUser::getId).collect(Collectors.toList());
+ List<AppUserWalletRecord> list1 = appUserWalletRecordService.lambdaQuery().list();
+
for (AppUser record : page) {
- List<AppUserWalletRecord> list = appUserWalletRecordService.lambdaQuery().eq(AppUserWalletRecord::getAppUserId, userId)
- .like(AppUserWalletRecord::getReason,"分佣").eq(AppUserWalletRecord::getChildAppUserId, record.getId()).list();
+ List<AppUserWalletRecord> list = list1.stream().filter(e -> e.getAppUserId().equals(Long.valueOf(userId))
+ && e.getReason().contains("分佣")
+ && e.getChildAppUserId().equals(record.getId())
+ ).collect(Collectors.toList());
+// List<AppUserWalletRecord> list = appUserWalletRecordService.lambdaQuery().eq(AppUserWalletRecord::getAppUserId, userId)
+// .like(AppUserWalletRecord::getReason,"分佣")
+// .eq(AppUserWalletRecord::getChildAppUserId, record.getId()).list();
+
BigDecimal reduce = list.stream().map(AppUserWalletRecord::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
record.setMoney(reduce);
}
@@ -1314,26 +1347,30 @@
public R<PageDTO<InviteRankListVO>> inviteRankList(
@RequestParam(value = "pageCurr", defaultValue = "1") Integer pageCurr,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
- Page<AppUser> objectPage = new Page<>(pageCurr, pageSize);
+ Page<InviteRankListVO> objectPage = new Page<>(pageCurr, pageSize);
+ int pageNo = (pageCurr - 1) * pageSize;
- List<AppUser> page = appUserService.lambdaQuery().ne(AppUser::getUserStatus, 3)
- .list();
- List<AppUser> res = new ArrayList<>();
- for (AppUser appUser : page) {
- int size = appUserService.lambdaQuery().ne(AppUser::getUserStatus, 3)
- .eq(AppUser::getInviteUserId, appUser.getId())
- .list().size();
- appUser.setCount(size);
- if (size>0){
- res.add(appUser);
- }
- }
- // 根据帮助人数 从大到小排序
- res.sort((o1, o2) -> o2.getCount() - o1.getCount());
- List<AppUser> testing = testing(res.size(), pageCurr, pageSize, res);
- objectPage.setRecords(testing);
- objectPage.setTotal(res.size());
+ List<InviteRankListVO> list = appUserService.inviteRankList(pageNo,pageSize);
+ int size = appUserService.inviteRankListNolimit().size();
+ objectPage.setRecords(list);
+ objectPage.setTotal(size);
return R.ok(PageDTO.of(objectPage, InviteRankListVO.class)) ;
+// List<AppUser> page = appUserService.lambdaQuery().ne(AppUser::getUserStatus, 3)
+// .list();
+// List<AppUser> res = new ArrayList<>();
+// for (AppUser appUser : page) {
+// int size = appUserService.lambdaQuery().ne(AppUser::getUserStatus, 3)
+// .eq(AppUser::getInviteUserId, appUser.getId())
+// .list().size();
+// appUser.setCount(size);
+// if (size>0){
+// res.add(appUser);
+// }
+// }
+// // 根据帮助人数 从大到小排序
+// res.sort((o1, o2) -> o2.getCount() - o1.getCount());
+// List<AppUser> testing = testing(res.size(), pageCurr, pageSize, res);
+
}
public static List<AppUser> testing(long total, long current, long size, List<AppUser> str){
List<AppUser> result = new ArrayList<>();
@@ -1365,25 +1402,13 @@
public R<PageDTO<InviteRankListVO>> inviteRankListShare(
@RequestParam(value = "pageCurr", defaultValue = "1") Integer pageCurr,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
- Page<AppUser> objectPage = new Page<>(pageCurr, pageSize);
+ Page<InviteRankListVO> objectPage = new Page<>(pageCurr, pageSize);
+ int pageNo = (pageCurr - 1) * pageSize;
- List<AppUser> page = appUserService.lambdaQuery().ne(AppUser::getUserStatus, 3)
- .list();
- List<AppUser> res = new ArrayList<>();
- for (AppUser appUser : page) {
- int size = appUserService.lambdaQuery().ne(AppUser::getUserStatus, 3)
- .eq(AppUser::getInviteUserId, appUser.getId())
- .list().size();
- appUser.setCount(size);
- if (size>0){
- res.add(appUser);
- }
- }
- // 根据帮助人数 从大到小排序
- res.sort((o1, o2) -> o2.getCount() - o1.getCount());
- List<AppUser> testing = testing(res.size(), pageCurr, pageSize, res);
- objectPage.setRecords(testing);
- objectPage.setTotal(res.size());
+ List<InviteRankListVO> list = appUserService.inviteRankList(pageNo,pageSize);
+ int size = appUserService.inviteRankListNolimit().size();
+ objectPage.setRecords(list);
+ objectPage.setTotal(size);
return R.ok(PageDTO.of(objectPage, InviteRankListVO.class)) ;
}
@PostMapping("/inviteRankListShareInfo")
--
Gitblit v1.7.1