bug修改

无关风月

2026-01-27 e5a431b9082c8882ccdd69d04d4bd76645d44b6e

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -18,12 +18,7 @@
import com.dsh.account.model.query.UserDetailsOfSearch;
import com.dsh.account.model.query.appUserQuery.QueryAppUser;
import com.dsh.account.model.vo.QueryAppUserVO;
import com.dsh.account.service.IVipPaymentService;
import com.dsh.account.service.TAppGiftService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.service.TCourseInfoRecordService;
import com.dsh.account.service.TStudentService;
import com.dsh.account.service.UserIntegralChangesService;
import com.dsh.account.service.*;
import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
@@ -49,6 +44,7 @@
import java.io.BufferedReader;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -85,7 +81,116 @@

    @Autowired
    private UserIntegralChangesService userIntegralChangesService;
    @Autowired
    private UserAuditService userAuditService;
    /**
     * 查询用户头像昵称审核列表
     */
    @ResponseBody
    @PostMapping("/user/listAudit")
    public List<Map<String, Object>> listAudit(@RequestBody UserAuditDTO dto) {
        List<Map<String, Object>> maps = userAuditService.listAudit(dto);
        for (Map<String, Object> map : maps) {
            if (map.get("auditTime")!=null){
                // 将时间戳转换为YYYY-MM-DD HH:mm:ss
                String s = map.get("auditTime").toString().split("\\.")[0];
                map.put("auditTime", s);
            }
        }
        return maps;
    }
    @ResponseBody
    @PostMapping("/user/audit")
    public void audit(@RequestBody TUserAudit dto){
        TUserAudit userAudit = userAuditService.getById(dto.getId());
        TAppUser appUser = appUserService.getById(userAudit.getAppUserId());
        if (dto.getState()==2){
            // 审核通过 修改用户头像或昵称
            if (userAudit.getType()==1){
                appUser.setName(userAudit.getName());
            }else{
                appUser.setHeadImg(userAudit.getHeadImg());
            }
            appUserService.updateById(appUser);
            userAudit.setState(2);
            userAudit.setAuditTime(new Date());

            userAuditService.updateById(userAudit);
        }else{
            userAudit.setState(3);
            userAudit.setRemark(dto.getRemark());
            userAudit.setAuditTime(new Date());

            userAuditService.updateById(userAudit);
        }
    }
    @ResponseBody
    @PostMapping("/user/auditBatch")
    public void auditBatch(@RequestBody AuditBatchDTO dto){
        List<TUserAudit> list = userAuditService.lambdaQuery().in(TUserAudit::getId, dto.getIds())
                .list();
        Map<Integer, TAppUser> userMap = appUserService.lambdaQuery()
                .in(TAppUser::getId, list.stream().map(TUserAudit::getAppUserId)
                        .collect(Collectors.toList())).list()
                .stream().collect(Collectors.toMap(TAppUser::getId, e -> e));
        for (TUserAudit userAudit : list) {
            TAppUser appUser = userMap.get(userAudit.getAppUserId());
            if (dto.getState()==2){
                // 审核通过 修改用户头像或昵称
                if (userAudit.getType()==1){
                    appUser.setName(userAudit.getName());
                }else{
                    appUser.setHeadImg(userAudit.getHeadImg());
                }
                userAudit.setAuditTime(new Date());
                userAudit.setState(2);
                userAuditService.updateById(userAudit);
            }else{
                userAudit.setState(3);
                userAudit.setRemark("");
                userAudit.setAuditTime(new Date());

                userAuditService.updateById(userAudit);
            }
        }

    }
    /**
     * 获取审核详情
     */
    @ResponseBody
    @GetMapping("/user/getAuditById/{id}")
    public TUserAudit getAuditById(@PathVariable("id")Integer id) {
        return userAuditService.getById(id);
    }
    /**
     * 批量修改用户昵称和头像
     */
    @ResponseBody
    @PostMapping("/base/appUser/updateHeadImgAndName")
    public void updateHeadImgAndName() {
        List<TAppUser> list = appUserService.list();
        for (TAppUser appUser : list) {
            appUser.setHeadImg("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/f7fbeaed277a45ab9591b70dc5699cab.jpg");
            String s = generateNickname(appUser.getId());
            appUser.setName(s);
        }
        appUserService.updateBatchById(list);
    }
    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;
    }
    /**
     * 根据介绍有礼id查询当前活动参与次数
     */
@@ -699,8 +804,7 @@
                integral = integral - updateIntegral.getIntegral();
                break;
        }
        appUser.setIntegral(integral);
        appUserService.updateById(appUser);

        UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
        userIntegralChanges.setAppUserId(updateIntegral.getId());
        userIntegralChanges.setType(1);
@@ -710,6 +814,8 @@
        userIntegralChanges.setInsertTime(new Date());
        userIntegralChanges.setCategory(updateIntegral.getChangeType());
        userIntegralChangesService.save(userIntegralChanges);
        appUser.setIntegral(integral);
        appUserService.updateById(appUser);
        return true;
    }