订单导入

xuhy

2025-08-13 b5db8e0184366cb62c3ba7f517c6be6fb474546f

订单导入

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -95,16 +95,16 @@
            recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "用户已停用，请联系管理员");
            throw new ServiceException("您的账号已被停用，请联系平台");
        }
        if (user.getRoleType()==2){
            Shop data = shopClient.getShopById(user.getObjectId()).getData();
            if (data==null){
                throw new ServiceException("门店不存在");
            }else{
                if (data.getStatus()==2){
                    throw new ServiceException("您所属门店已被冻结，请联系平台");
                }
            }
        }
//        if (user.getRoleType()==2){
//            Shop data = shopClient.getShopById(user.getSiteId()).getData();
//            if (data==null){
//                throw new ServiceException("站点不存在");
//            }else{
//                if (data.getStatus()==2){
//                    throw new ServiceException("您所属门店已被冻结，请联系平台");
//                }
//            }
//        }
        passwordService.validate(user, password, request);
        recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_SUCCESS_STATUS, "登录成功");
        return userInfo;

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -376,9 +376,17 @@
                && e.getMenuId() != 1198
                && e.getMenuId() != 1199
                && e.getMenuId() != 1201
                && e.getMenuId() != 319
                && e.getMenuId() != 318
                && e.getMenuId() != 321
                && e.getMenuId() != 322
                && e.getMenuId() != 323
                && e.getMenuId() != 1205).collect(Collectors.toList());
        // 第一级
        List<SysMenus> s1 = list.stream().filter(e -> e.getMenuType().equals("M")).collect(Collectors.toList());
        List<SysMenus> s1 = list.stream().filter(e -> e.getMenuType().equals("M")
                && e.getMenuId() != 317
                && e.getMenuId() != 320
                && e.getMenuId() != 324).collect(Collectors.toList());

        for (SysMenus menus : s2) {
            List<SysMenus> collect = s3.stream().filter(e -> e.getParentId().equals(menus.getMenuId())).collect(Collectors.toList());

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java

@@ -258,6 +258,8 @@
        }
        for (Integer id : ids) {
            Site site = this.getById(id);
            // 删除账号
            sysUserClient.delSysUserById(site.getUserId());
            this.removeById(site);
        }
        return AjaxResult.success();