From e5a431b9082c8882ccdd69d04d4bd76645d44b6e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 一月 2026 20:50:03 +0800
Subject: [PATCH] bug修改

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java |   76 +++++++++++++++++++++++++++++++++++---
 1 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 29e814b..ad1e5a5 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -14,6 +14,7 @@
 import com.alipay.api.response.AlipayTradeRoyaltyRelationBindResponse;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsh.account.dto.*;
 import com.dsh.account.entity.*;
@@ -42,10 +43,7 @@
 import com.dsh.account.model.vo.classDetails.RegisteredCourse;
 import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
 import com.dsh.account.model.vo.userBenefitDetail.*;
-import com.dsh.account.service.IRefereeService;
-import com.dsh.account.service.TAppGiftService;
-import com.dsh.account.service.TAppUserService;
-import com.dsh.account.service.UserIntegralChangesService;
+import com.dsh.account.service.*;
 import com.dsh.account.util.*;
 import com.dsh.account.util.akeylogin.Md5Util;
 import com.dsh.account.util.wx.WxV3PayConfig;
@@ -153,6 +151,8 @@
 
     @Resource
     private TAppUserMapper appUserMapper;
+    @Autowired
+    private UserAuditService userAuditService;
 
     @Autowired
     private TAppGiftService appGiftService;
@@ -162,6 +162,8 @@
 
 
     private String aliAppid = "2021004105665036";//支付宝appid
+    // 默认头像
+    private String headImg = "https://we-park-life.oss-cn-beijing.aliyuncs.com/img/f7fbeaed277a45ab9591b70dc5699cab.jpg";
 
     private String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥
 
@@ -463,8 +465,12 @@
         tAppUser.setProvinceCode("");
         tAppUser.setCity("");
         tAppUser.setCityCode("");
+        tAppUser.setHeadImg(headImg);
         // 注册用户
         int insert = this.baseMapper.insert(tAppUser);
+        String s = generateNickname(tAppUser.getId());
+        tAppUser.setName(s);
+        this.baseMapper.updateById(tAppUser);
         // 介绍有礼
         if (addAppUserVo.getReferralUserId() != null || ToolUtil.isNotEmpty(addAppUserVo.getInvitePhone())) {
             if (ToolUtil.isEmpty(addAppUserVo.getLat()) || ToolUtil.isEmpty(addAppUserVo.getLon())) {
@@ -559,8 +565,12 @@
             tAppUser.setPassword(Md5Util.MD5Encode("111111", null));
             tAppUser.setIsVip(0);
             tAppUser.setState(1);
+            tAppUser.setHeadImg(headImg);
             tAppUser.setInsertTime(new Date());
             this.baseMapper.insert(tAppUser);
+            String s = generateNickname(tAppUser.getId());
+            tAppUser.setName(s);
+            this.baseMapper.updateById(tAppUser);
         }
         if (tAppUser.getState() == 2) {
             return ResultUtil.error("您的账号已被冻结", "");
@@ -588,8 +598,8 @@
                 tAppUser.setPhone(loginWechatVo.getPhone());
                 tAppUser.setPassword(Md5Util.MD5Encode("111111", null));
                 tAppUser.setIsVip(0);
-                tAppUser.setName(loginWechatVo.getNickname());
-                tAppUser.setHeadImg(loginWechatVo.getHeadimgurl());
+//                tAppUser.setName(loginWechatVo.getNickname());
+                tAppUser.setHeadImg(headImg);
                 tAppUser.setGender(loginWechatVo.getSex());
                 tAppUser.setState(1);
                 tAppUser.setInsertTime(new Date());
@@ -598,6 +608,11 @@
                 tAppUser.setCity("");
                 tAppUser.setCityCode("");
                 this.baseMapper.insert(tAppUser);
+                // 设置用户昵称为用户+id 保留6位小数 补0
+                String s = generateNickname(tAppUser.getId());
+                tAppUser.setName(s);
+                this.baseMapper.updateById(tAppUser);
+
             }
         }
         if (tAppUser.getState() == 2) {
@@ -623,6 +638,26 @@
         }
         return ResultUtil.success(map);
     }
+    /**
+     * 根据用户ID生成固定格式的昵称
+     * @param userId 用户ID
+     * @return 格式化的昵称
+     */
+    public static String generateNickname(Integer userId) {
+        if (userId == null) {
+            return null;
+        }
+
+        // 将用户ID转换为字符串
+        String userIdStr = String.valueOf(userId);
+
+        // 使用String.format确保总长度为6位,不足的前面补0
+        String formattedId = String.format("%06d", Long.parseLong(userIdStr));
+
+        // 返回"用户" + 格式化后的ID
+        return "用户" + formattedId;
+    }
+
 
     /**
      * 获取JWT token和存储个人信息
@@ -1276,6 +1311,34 @@
     @Override
     public ResultUtil<String> updateInfo(UpdateInfoDto dto, Integer uid) {
         TAppUser tAppUser = appUserMapper.selectById(uid);
+        if (StringUtils.hasLength(dto.getName())){
+            if (!tAppUser.getName().equals(dto.getName())){
+                TUserAudit userAudit = userAuditService
+                        .lambdaQuery().eq(TUserAudit::getType, 1)
+                        .eq(TUserAudit::getAppUserId, tAppUser.getId())
+                        .ne(TUserAudit::getState, 2).last("limit 1").one();
+                if (userAudit!=null){
+                    userAudit.setState(1);
+                    userAudit.setName(dto.getName());
+                    UpdateWrapper<TUserAudit> tUserAuditUpdateWrapper = new UpdateWrapper<>();
+                    tUserAuditUpdateWrapper.eq("id",userAudit.getId());
+                    tUserAuditUpdateWrapper.set("state",1);
+                    tUserAuditUpdateWrapper.set("name",dto.getName());
+                    tUserAuditUpdateWrapper.set("remarks",null);
+                    tUserAuditUpdateWrapper.set("auditId",null);
+                    tUserAuditUpdateWrapper.set("auditTime",null);
+                    userAuditService.update(tUserAuditUpdateWrapper);
+                }else{
+                    TUserAudit tUserAudit = new TUserAudit();
+                    tUserAudit.setAppUserId(tAppUser.getId());
+                    tUserAudit.setName(dto.getName());
+                    tUserAudit.setType(1);
+                    tUserAudit.setInsertTime(new Date());
+                    userAuditService.save(tUserAudit);
+
+                }
+            }
+        }
         if (ToolUtil.isNotEmpty(dto.getName())) {
             tAppUser.setName(dto.getName());
         }
@@ -1292,6 +1355,7 @@
         if (ToolUtil.isNotEmpty(dto.getGender())) {
             tAppUser.setGender(dto.getGender());
         }
+        tAppUser.setName(null);
         appUserMapper.updateById(tAppUser);
         return ResultUtil.success();
     }

--
Gitblit v1.7.1