From 350067a73fc9ed0a35582b900533c2708d5b1212 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 17:53:01 +0800
Subject: [PATCH] 所有代码
---
guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/AppUserController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/AppUserController.java b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/AppUserController.java
index 502457d..b5e2e74 100644
--- a/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/AppUserController.java
+++ b/guns-management/src/main/java/com/stylefeng/guns/modular/code/controller/AppUserController.java
@@ -127,8 +127,11 @@
BeanUtils.copyProperties(user,appUserVO);
// 查询这个用户是不是有人邀请他
if (user.getInviteUserId()!=null){
- String name = appUserService.selectById(user.getInviteUserId()).getName();
- appUserVO.setInviteUserName(name);
+ AppUser appUser = appUserService.selectById(user.getInviteUserId());
+ if (appUser!=null){
+ String name = appUser.getName();
+ appUserVO.setInviteUserName(name);
+ }
}
appUserVOS.add(appUserVO);
}
@@ -234,7 +237,8 @@
BigDecimal friendMoney = new BigDecimal("0");
// 查询消费金额
List<BigDecimal> userId = inviteService.selectList(new EntityWrapper<Invite>()
- .eq("userId", id)).stream().map(Invite::getAmount).collect(Collectors.toList());
+ .eq("giftUserId", id)
+ .eq("type",1)).stream().map(Invite::getAmount).collect(Collectors.toList());
friendMoney = userId.stream()
.reduce(BigDecimal.ZERO, BigDecimal::add);
res.setFriendMoney(friendMoney);
--
Gitblit v1.7.1