# 登录提示

jiaosong

2023-10-28 908ef182637a3327f9211bc49fdd4b68f768e13b

# 登录提示

 server/platform/src/main/java/com/doumee/config/shiro/ShiroRealm.java

@@ -84,7 +84,7 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，账号或密码不正确！");
        }
        if(Objects.equals(user.getStatus(),Constants.ONE)){
            throw new AuthenticationException("用户已被禁用，请联系管理员");
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"登录账号已禁用，请联系管理员！");
        }
        // 获取登录用户信息
        List<SystemRole> roles = systemRoleService.findByUserId(user.getId());

 server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java

@@ -47,7 +47,6 @@
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String info;

    @ApiModelProperty(value = "订单编码")

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -635,8 +635,12 @@
                }
            }
        QueryWrapper<Refund> queryWrapper2 = new QueryWrapper<>();
        queryWrapper2.lambda().ge(param.getStartDate() !=null,Refund::getDoneDate,Utils.Date.getStart(param.getStartDate()));
        queryWrapper2.lambda().le(param.getEndDate() !=null,Refund::getDoneDate,Utils.Date.getEnd(param.getEndDate()));
        if(Objects.nonNull(param.getStartDate())) {
            queryWrapper2.lambda().ge(Refund::getDoneDate, Utils.Date.getStart(param.getStartDate()));
        }
        if(Objects.nonNull(param.getEndDate())) {
            queryWrapper2.lambda().le(Refund::getDoneDate, Utils.Date.getEnd(param.getEndDate()));
        }
        queryWrapper2.lambda().eq(Refund::getIsdeleted, Constants.ZERO);
        queryWrapper2.select( "count(id) as count_num"
                ,"sum(money) as money" );

 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java

@@ -189,6 +189,15 @@
    public PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap) {
        IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
        MemberRidesQuery model = pageWrap.getModel();
        //已还车
        if (Objects.nonNull(model.getHasBack()) && model.getHasBack()){
            queryWrapper.eq(MemberRides::getStatus,Constants.TWO);
        }
        //未归还的
        if (Objects.nonNull(model.getHasBack()) && !model.getHasBack()){
            queryWrapper.eq(MemberRides::getStatus,Constants.ONE);
        }
        IPage<BikeLogDTO> bikeLogDTOIPage = memberRidesJoinMapper.selectJoinPage(page, BikeLogDTO.class, queryWrapper);
        initBikeLogObj(bikeLogDTOIPage.getRecords());
        return PageData.from(bikeLogDTOIPage);
@@ -221,7 +230,7 @@
            queryWrapper.ge(MemberRides::getRentDate, Utils.Date.getStart(model.getStartDate()));
        }
        if (Objects.nonNull(model.getEndDate())) {
            queryWrapper.le(MemberRides::getRentDate, Utils.Date.getStart(model.getEndDate()));
            queryWrapper.le(MemberRides::getRentDate, Utils.Date.getEnd(model.getEndDate()));
        }
        queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
        queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus());

 server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java

@@ -120,7 +120,10 @@
            loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
            loginLog.setSuccess(Constants.ONE);
            systemLoginLogService.create(loginLog);
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(),e.getCause().getMessage());
            if (e.getCause() instanceof BusinessException) {
                throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), e.getCause().getMessage());
            }
            throw new BusinessException(ResponseStatus.ACCOUNT_INCORRECT.getCode(), "提示对不起，账号或密码错误！");
        }
    }