修改bug

liujie

2026-01-05 553c738f567f2a3e40a1be56a88778e667c1dc96

修改bug

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

@@ -173,6 +173,35 @@
        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();
            }
        }
    }


    @Log(title = "小程序用户-金币导入", businessType = BusinessType.IMPORT)
    @ApiOperation(value = "小程序用户-金币导入")
@@ -248,6 +277,36 @@
    }



    @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)

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

@@ -118,6 +118,10 @@
    public R<String> add(@RequestBody TCompany company) {
        company.setStatus(1);
        company.setCreateUserId(getUserId());
        if(company.getAccount()!=null &&  "admin".equals(company.getAccount())){
            return R.fail("账号不能为admin");
        }

        SysUser user = new SysUser();
        user.setRoleType(2);
        user.setDeptId(124l);
@@ -153,6 +157,9 @@
    @PostMapping(value = "/edit")
    @Log(title = "修改公司-修改", businessType = BusinessType.UPDATE)
    public R<String> edit(@RequestBody TCompany company) {
        if(company.getAccount()!=null &&  "admin".equals(company.getAccount())){
            return R.fail("账号不能为admin");
        }
        SysUser user = userService.getUserByCompanyId(company.getId());
        if (!userService.checkUserNameUnique(user)) {
            return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -255,6 +262,9 @@
    @PostMapping("/system/user/add")
    public R<String> add(@RequestBody SysUser user)
    {
        if(user.getUserName()!=null &&  "admin".equals(user.getUserName())){
            return R.fail("账号不能为admin");
        }
        user.setUserName(user.getUserName());
        if (!userService.checkUserNameUnique(user))
        {
@@ -303,6 +313,9 @@
    @PostMapping("/system/user/edit")
    public R edit(@RequestBody SysUser user)
    {
        if(user.getUserName()!=null &&  "admin".equals(user.getUserName())){
            return R.fail("账号不能为admin");
        }
        user.setUserName(user.getPhonenumber());
//        userService.checkUserAllowed(user);
//        userService.checkUserDataScope(user.getUserId());

 ruoyi-admin/src/main/resources/application.yml

@@ -1,4 +1,4 @@
# 项目相关配置
spring:
  profiles:
    active: prod
    active: test

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRefundApplicationServiceImpl.java

@@ -106,6 +106,9 @@
        vo.setCode(order.getCode());
        vo.setCreateTime(order.getCreateTime());
        vo.setOrderPrice(order.getOrderPrice());
        vo.setPaymentType(order.getPaymentType());

        vo.setRefundAmount(order.getPaymentPrice());

        // 用户信息
        TAppUser appUser = tAppUserService.getById(order.getAppUserId());

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TRefundApplicationVo.java

@@ -99,6 +99,12 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime auditTime;

    @ApiModelProperty(value = "支付方式1=订金+尾款，2=全款")
    private Integer paymentType;


    @ApiModelProperty(value = "退款金额")
    private BigDecimal refundAmount;