From 25ed781aaff2012410adae5df4e9f20961329581 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 26 一月 2025 21:14:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 3 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 f422024..8c18942 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
@@ -12,8 +12,11 @@
import com.ruoyi.account.mapper.AppUserMapper;
import com.ruoyi.account.service.*;
import com.ruoyi.account.util.ObsUploadUtil;
+import com.ruoyi.account.util.weChat.EnvVersion;
+import com.ruoyi.account.util.weChat.WeChatUtil;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -31,6 +34,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -92,6 +96,14 @@
private UserCancellationLogService userCancellationLogService;
@Resource
private BalanceChangeRecordService balanceChangeRecordService;
+ @Resource
+ private UserChangeLogService userChangeLogService;
+
+ @Resource
+ private WeChatUtil weChatUtil;
+
+ @Value("${file.upload.location}")
+ private String filePath;
@ResponseBody
@@ -114,6 +126,17 @@
public AppUser getAppUserById(@RequestParam("id") Long id) {
return appUserService.getById(id);
}
+
+ @PostMapping("/getBaseUserById")
+ public R<Map<String, Object>> getBaseUserById(@RequestParam("id") Long id) {
+ AppUser appUser = appUserService.getById(id);
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", appUser.getId());
+ map.put("name", appUser.getName());
+ map.put("phone", appUser.getPhone());
+ return R.ok(map);
+ }
+
@ResponseBody
@PostMapping("/editAppUserById")
@@ -200,6 +223,13 @@
public R<AppUser> info() {
Long userId = tokenService.getLoginUserApplet().getUserid();
AppUser user = appUserService.getById(userId);
+ if(StringUtils.isEmpty(user.getQrCode())){
+ //获取微信推广二维码
+ String fileName = UUID.randomUUID() + ".jpg";
+ String getwxacodeunlimit = weChatUtil.getwxacodeunlimit("pages/login/login", "id=" + user.getId(), EnvVersion.RELEASE, filePath + fileName);
+ user.setQrCode(getwxacodeunlimit);
+ appUserService.updateById(user);
+ }
return R.ok(user);
}
@@ -258,49 +288,87 @@
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.list();
+
+ Long vip1Count1 =0L;
+ Long vip1Count2 =0L;
+ Long vip1Count3 =0L;
+ Long vip1Count4 =0L;
+ Long vip1Count5 =0L;
+ Long vip1Count6 =0L;
+ Long vip1Count7 =0L;
for (AppUser appUser : list) {
+ if (appUser.getVipId() == 1){
+ vip1Count1++;
+ }
+ if (appUser.getVipId() == 2){
+ vip1Count2++;
+ }
+ if (appUser.getVipId() == 3){
+ vip1Count3++;
+ }
+ if (appUser.getVipId() == 4){
+ vip1Count4++;
+ }
+ if (appUser.getVipId() == 5){
+ vip1Count5++;
+ }
+ if (appUser.getVipId() == 6){
+ vip1Count6++;
+ }
+ if (appUser.getVipId() == 7){
+ vip1Count7++;
+ }
+
Long count1 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 1)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count1 += count1;
+
Long count2 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 2)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count2 += count2;
Long count3 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 3)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count3 += count3;
Long count4 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 4)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count4 += count4;
Long count5 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 5)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count5 += count5;
Long count6 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 6)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count6 += count6;
Long count7 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 7)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count7 += count7;
appUser.setCount1(count1);
appUser.setCount2(count2);
appUser.setCount3(count3);
@@ -310,7 +378,13 @@
appUser.setCount7(count7);
}
user.setBottomUsers(list);
-
+ user.setCount1(vip1Count1);
+ user.setCount2(vip1Count2);
+ user.setCount3(vip1Count3);
+ user.setCount4(vip1Count4);
+ user.setCount5(vip1Count5);
+ user.setCount6(vip1Count6);
+ user.setCount7(vip1Count7);
return R.ok(user);
}
@@ -702,8 +776,7 @@
return R.ok(byId);
}
- @Resource
- private UserChangeLogService userChangeLogService;
+
@GetMapping("/change/vip")
@ApiOperation(value = "用户列表-修改会员等级", tags = {"管理后台"})
--
Gitblit v1.7.1