修改bug

liujie

2026-01-05 56ffeed86cde1ab89a7dce93f8c7a048f243c539

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java

@@ -72,7 +72,7 @@

    private final TAppUserService appUserService;

    private  final RedisTemplate redisTemplate;
    private final RedisTemplate redisTemplate;

    private final TokenService tokenService;

@@ -132,9 +132,9 @@
        }
        TAppUser appUser = appUserService.getById(dto.getId());
        String code = appUser.getCode();
        if(code==null){
        if (code == null) {
            appUser.setCode(dto.getCode());
        }else {
        } else {
            if (dto.getCode() != null && !dto.getCode().isEmpty() && !dto.getCode().equals(code)) {
                appUser.setCode(dto.getCode());
                // 移除之前的二维码
@@ -164,13 +164,42 @@
        TAppUser appUser = appUserService.getById(id);
        TAppUserVo tAppUserVo = new TAppUserVo();
        BeanUtils.copyProperties(appUser, tAppUserVo);
        if(appUser.getCompanyId()!=null){
        if (appUser.getCompanyId() != null) {
            tAppUserVo.setReferrerCompany(companyService.getById(appUser.getCompanyId()));
        }
        if(appUser.getReferrerUserId()!=null && appUser.getReferrerStatus()==2){
        if (appUser.getReferrerUserId() != null && appUser.getReferrerStatus() == 2) {
            tAppUserVo.setReferrerUser(appUserService.getById(appUser.getReferrerUserId()));
        }
        return R.ok(tAppUserVo);
    }

    @ApiOperation(value = "小程序用户金币导入模板下载")
    @GetMapping("/import-template_gold")
    public void importTemplateGold() {
        List<AppUserGoldImport> imports = new ArrayList<>();
        AppUserGoldImport goldImport = new AppUserGoldImport();
        imports.add(goldImport);
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), AppUserGoldImport.class, imports);
        HttpServletResponse response = WebUtils.response();
        ServletOutputStream outputStream = null;
        try {
            String fileName = URLEncoder.encode("金币导入模板.xls", "utf-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
            response.setHeader("content-Type", "application/vnd.ms-excel");
            response.setHeader("Pragma", "no-cache");
            response.setHeader("Cache-Control", "no-cache");
            outputStream = response.getOutputStream();
            workbook.write(outputStream);
        } catch (IOException e) {
            e.printStackTrace();
            System.out.println("金币导入模板下载失败!");
        } finally {
            try {
                outputStream.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    }


@@ -248,6 +277,35 @@
    }


    @ApiOperation(value = "小程序用户导入模板下载")
    @GetMapping("/import-template_user")
    public void importTemplate() {
        List<AppUserImport> imports = new ArrayList<>();
        AppUserImport appUserImport = new AppUserImport();
        imports.add(appUserImport);
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), AppUserImport.class, imports);
        HttpServletResponse response = WebUtils.response();
        ServletOutputStream outputStream = null;
        try {
            String fileName = URLEncoder.encode("小程序用户导入模板.xls", "utf-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
            response.setHeader("content-Type", "application/vnd.ms-excel");
            response.setHeader("Pragma", "no-cache");
            response.setHeader("Cache-Control", "no-cache");
            outputStream = response.getOutputStream();
            workbook.write(outputStream);
        } catch (IOException e) {
            e.printStackTrace();
            System.out.println("小程序用户导入模板下载失败!");
        } finally {
            try {
                outputStream.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    }

    @Log(title = "小程序用户-用户导入", businessType = BusinessType.IMPORT)
    @ApiOperation(value = "小程序用户-用户导入")
    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
@@ -294,6 +352,10 @@
                result.append("第" + i + "行：[", "出生日期" + "]不能为空");
                continue;
            }
            if (!StringUtils.hasLength(appUserImport.getPromotion())) {
                result.append("第" + i + "行：[", "推广权限" + "]不能为空");
                continue;
            }
            if (!StringUtils.hasLength(appUserImport.getRole())) {
                result.append("第" + i + "行：[", "角色" + "]不能为空");
                continue;
@@ -321,6 +383,13 @@
                continue;
            }

            String promotion = appUserImport.getPromotion();
            Integer promotionType = "是".equals(promotion) ? 1 : "否".equals(promotion) ? 0 : null;
            if (promotionType == null) {
                result.append("第" + i + "行：[", "推广权限" + "]格式错误");
                continue;
            }

            String birth = appUserImport.getBirth();
            LocalDate birthday = null;
            try {
@@ -344,24 +413,34 @@
            tAppUser.setGender(gender);
            tAppUser.setBirthday(birthday);
            tAppUser.setUserType(userType);
            tAppUser.setPromotionStatus(promotionType);


            if (appUserImport.getDealerCode() != null) {
                TCompany one = companyService.getOne(new LambdaQueryWrapper<TCompany>().eq(TCompany::getCode, appUserImport.getDealerCode()).ne(TCompany::getStatus, 3).last("LIMIT 1"));
                if (one != null) {
                    tAppUser.setCompanyId(one.getId());
                }
            }
            appUserService.save(tAppUser);
            i++;
        }


        for (AppUserImport appUserImport : imports) {

            TAppUser one = appUserService.getOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhone, appUserImport.getPhone()).ne(TAppUser::getStatus, 3).last("LIMIT 1"));
            if (appUserImport.getReferrerCode() != null) {
                TAppUser referrerUser = appUserService.getOne(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getCode, appUserImport.getReferrerCode()).ne(TAppUser::getStatus, 3).last("LIMIT 1"));
                if (referrerUser != null) {
                    tAppUser.setReferrerUserId(referrerUser.getId());
                    tAppUser.setReferrerStatus(1);
                    tAppUser.setReferrerTime(LocalDateTime.now());
                    one.setReferrerUserId(referrerUser.getId());
                    one.setReferrerStatus(1);
                    one.setReferrerTime(LocalDateTime.now());
                }
            }
            if (appUserImport.getDealerCode() != null) {
            }
            TCompany one = companyService.getOne(new LambdaQueryWrapper<TCompany>().eq(TCompany::getCode, appUserImport.getDealerCode()).ne(TCompany::getStatus, 3).last("LIMIT 1"));
            if (one != null) {
                tAppUser.setCompanyId(one.getId());
            }
            appUserService.save(user);
            i++;
            appUserService.updateById(one);
        }

        if (!result.isEmpty()) {
            return R.fail(result.toString());
        }
@@ -505,18 +584,18 @@
                .orderByDesc(TGoldChangeRecord::getCreateTime));

        List<TGoldChangeRecord> records = page.getRecords();
        if(!records.isEmpty()){
        if (!records.isEmpty()) {
            records.forEach(record -> {
                Long createUserId = record.getCreateUserId();
                if(createUserId!=null){
                if (createUserId != null) {
                    SysUser sysUser = sysUserMapper.selectUserById(createUserId);
                    if(sysUser!=null){
                    if (sysUser != null) {
                        record.setCreateUserName(sysUser.getUserName());
                    }
                }
            });
        }
        page.setRecords( records);
        page.setRecords(records);
        return R.ok(page);
    }

@@ -528,7 +607,7 @@
    public R goldChange(@RequestBody GoldChangeDto dto) {
        Long userId = tokenService.getLoginUser().getUserId();

        if(dto.getChangeNum()<=0){
        if (dto.getChangeNum() <= 0) {
            return R.fail("充值数不能小于等于0");
        }

@@ -555,11 +634,11 @@
    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
    public R goldSub(@RequestBody GoldChangeDto dto) {
        Long userId = tokenService.getLoginUser().getUserId();
        if(dto.getChangeNum()<=0){
        if (dto.getChangeNum() <= 0) {
            return R.fail("扣除数不能小于等于0");
        }
        TAppUser appUser = appUserService.getById(dto.getUserId());
        if(appUser.getGoldBalance().compareTo(new BigDecimal(dto.getChangeNum()))<0){
        if (appUser.getGoldBalance().compareTo(new BigDecimal(dto.getChangeNum())) < 0) {
            return R.fail("用户金币不足");
        }
        TGoldChangeRecord tGoldChangeRecord = new TGoldChangeRecord();
@@ -579,7 +658,7 @@
    @PostMapping(value = "/pageOrderList")
    public R<Page<TBigGiftPackageOrder>> pageOrderList(@RequestBody GoldChangeRecordQuery query) {
        Page<TBigGiftPackageOrder> tBigGiftPackageOrderPage = new Page<>(query.getPageNum(), query.getPageSize());
        List<TBigGiftPackageOrder> list = bigGiftPackageOrderService.pageOrderList(tBigGiftPackageOrderPage,query);
        List<TBigGiftPackageOrder> list = bigGiftPackageOrderService.pageOrderList(tBigGiftPackageOrderPage, query);
        tBigGiftPackageOrderPage.setRecords(list);
        return R.ok(tBigGiftPackageOrderPage);
    }
@@ -588,7 +667,7 @@
    @ApiOperation(value = "用户-购买记录导出")
    @PostMapping(value = "/pageOrderListExport")
    @Log(title = "购买记录-导出", businessType = BusinessType.EXPORT)
    public void pageOrderListExport(@RequestBody @Valid GoldChangeRecordQuery query){
    public void pageOrderListExport(@RequestBody @Valid GoldChangeRecordQuery query) {
        List<TBigGiftPackageOrder> list = bigGiftPackageOrderService.pageOrderListExport(query);
        ArrayList<TBigGiftPackageOrderUserExport> tBigGiftPackageOrderUserExports = new ArrayList<>();
        for (TBigGiftPackageOrder order : list) {
@@ -632,13 +711,11 @@
    }




    @ApiOperation(value = "用户- 推广记录")
    @PostMapping("/promotionPageList")
    public R<Page<UserPromotionPageListVo>> promotionPageList(@RequestBody @Valid UserPromotionPageListQuery query) {
        Page<UserPromotionPageListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
        List<UserPromotionPageListVo> list = appUserService.userPromotionPageList(page,query);
        List<UserPromotionPageListVo> list = appUserService.userPromotionPageList(page, query);
        page.setRecords(list);
        return R.ok(page);
    }
@@ -647,7 +724,7 @@
    @ApiOperation(value = "用户-推广记录导出")
    @PostMapping(value = "/exportUserPromotion")
    @Log(title = "推广记录-导出", businessType = BusinessType.EXPORT)
    public void exportUserPromotion(@RequestBody @Valid UserPromotionPageListQuery query){
    public void exportUserPromotion(@RequestBody @Valid UserPromotionPageListQuery query) {

        List<UserPromotionPageListVo> list = appUserService.userPromotionPageListExport(query);
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), UserPromotionPageListVo.class, list);
@@ -680,7 +757,7 @@
    @PostMapping("/profitUserPageList")
    public R<Page<UserProfitPageListVo>> profitUserPageList(@RequestBody @Valid UserProfitPageListQuery query) {
        Page<UserProfitPageListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
        List<UserProfitPageListVo> list = bigGiftPackageOrderService.profitUserPageList(page,query);
        List<UserProfitPageListVo> list = bigGiftPackageOrderService.profitUserPageList(page, query);

        page.setRecords(list);
        return R.ok(page);
@@ -690,7 +767,7 @@
    @ApiOperation(value = "用户收益明细导出")
    @PostMapping(value = "/exportUserProfit")
    @Log(title = "收益明细-导出", businessType = BusinessType.EXPORT)
    public void exportUserProfit(@RequestBody @Valid UserProfitPageListQuery query){
    public void exportUserProfit(@RequestBody @Valid UserProfitPageListQuery query) {

        List<UserProfitPageListVo> list = bigGiftPackageOrderService.profitUserPageListExport(query);
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), UserProfitPageListVo.class, list);
@@ -732,7 +809,7 @@
    @ApiOperation(value = "用户结算记录导出")
    @PostMapping(value = "/exportSettlementPageList")
    @Log(title = "结算记录-导出", businessType = BusinessType.EXPORT)
    public void exportSettlementPageList(@RequestBody @Valid GoldChangeRecordQuery query){
    public void exportSettlementPageList(@RequestBody @Valid GoldChangeRecordQuery query) {

        List<TIntegralSettlement> list = integralSettlementService.list(new LambdaQueryWrapper<TIntegralSettlement>().eq(TIntegralSettlement::getAppUserId, query.getUserId()).orderByDesc(TIntegralSettlement::getCreateTime));
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TIntegralSettlement.class, list);