From 4f97bdbaadcdc19df9dfb0971b930d799c4aeddc Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 13 三月 2025 14:52:26 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index e139d0f..0ef6e50 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;
+import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -31,7 +32,6 @@
import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.other.api.feignClient.ShopBalanceStatementClient;
import com.ruoyi.other.api.feignClient.ShopClient;
-import com.ruoyi.other.api.feignClient.StoreClient;
import com.ruoyi.other.api.feignClient.VipSettingClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
@@ -73,8 +73,6 @@
@Resource
private AppUserService appUserService;
@Resource
- private StoreClient storeClient;
- @Resource
private UserCouponService userCouponService;
@Resource
@@ -83,8 +81,6 @@
private VipSettingClient vipSettingClient;
@Resource
private UserPointService userPointService;
- @Resource
- private VipSettingService vipSettingService;
@Resource
private AppUserMapper appUserMapper;
@Resource
@@ -108,6 +104,9 @@
@Resource
private WeChatUtil weChatUtil;
+
+ @Resource
+ private IAppUserGiveawayTemporaryService appUserGiveawayTemporaryService;
@Value("${file.upload.location}")
private String filePath;
@@ -291,6 +290,16 @@
}
}
+ if (user.getShopName() == null){
+ user.setShopName("");
+ }
+ if (user.getShopCover() == null){
+ user.setShopCover("");
+ }
+ if (user.getShopAddress() == null){
+ user.setShopAddress("");
+ }
+
//指导老师
allSuperiors.stream()
.filter(superiors -> superiors.getVipId() != null && superiors.getVipId() > 3)
@@ -300,12 +309,23 @@
user.setTeacherPhone(superiors.getPhone());
});
+ if (user.getTeacher() == null){
+ user.setTeacher("");
+ }
+ if (user.getTeacherPhone() == null){
+ user.setTeacherPhone("");
+ }
+
+
//获取绑定上级
if (user.getInviteUserId() != null) {
AppUser byId = appUserService.getById(user.getInviteUserId());
user.setTopUser(byId);
+ }else {
+ AppUser topUser = new AppUser();
+ user.setTopUser(topUser);
}
//获取绑定下级列表
List<AppUser> list = appUserService.lambdaQuery()
@@ -534,6 +554,11 @@
} else {
user.setIsSign(0);
}
+
+ List<AppUserGiveawayTemporary> temporaryList = appUserGiveawayTemporaryService.list(new LambdaQueryWrapper<AppUserGiveawayTemporary>()
+ .eq(AppUserGiveawayTemporary::getAppUserId, userId));
+
+ user.setLavePoint(temporaryList.stream().mapToInt(AppUserGiveawayTemporary::getTotalPoint).sum() + user.getTotalPoint());
return R.ok(user);
}
@@ -803,17 +828,17 @@
}
private void loginout(Long userId) {
+ // 获取所有符合模式的缓存键
Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
- if (!CollectionUtils.isEmpty(keys)) {
- for (String key : keys) {
- LoginUser user = redisService.getCacheObject(key);
- if (user == null || user.getUserid() == null) {
- continue;
- }
- if (user.getUserid().equals(userId)) {
- redisService.deleteObject(key);
- break;
- }
+ if (CollectionUtils.isEmpty(keys)) {
+ return; // 如果没有匹配的键，直接返回
+ }
+
+ // 遍历所有键并删除与指定用户ID相关的登录信息
+ for (String key : keys) {
+ LoginUser user = redisService.getCacheObject(key);
+ if (user != null && userId.equals(user.getUserid())) {
+ redisService.deleteObject(key);
}
}
}
@@ -1056,6 +1081,13 @@
userId = orderClient.getAppUserByShoppingShop(shopId).getData();
}
UserStatistics userStatistics = appUserMapper.getUserStatistics(shopId, userId);
+ List<Shop> shopList = shopClient.getAllShop().getData();
+ if (CollectionUtil.isNotEmpty(shopList)){
+ long count = shopList.stream().map(Shop::getAppUserId).distinct().count();
+ userStatistics.setShopUser((int) count);
+ }else {
+ userStatistics.setShopUser(0);
+ }
return R.ok(userStatistics);
}
@@ -1283,7 +1315,11 @@
public void vipUpgrade(@RequestParam("appUserId") Long appUserId){
appUserService.vipUpgrade(appUserId);
}
-
+
+ @PostMapping("/vipConsumption")
+ public void vipConsumption(@RequestParam("appUserId") Long appUserId){
+ appUserService.vipConsumption(appUserId);
+ }
/**
* 检查会员降级
--
Gitblit v1.7.1