bug

jiangping

2023-10-18 6089e88cde34ef3519312d3f563fc3809e138948

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

@@ -476,7 +476,6 @@
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 该车型暂时不能借车操作哦，请更换其他车型重试！");
        }
        Date date =new Date();

        QueryWrapper<PricingParam> param = new QueryWrapper<>();
        param.lambda().eq(PricingParam::getStatus,Constants.ZERO);
        param.lambda().eq(PricingParam::getIsdeleted,Constants.ZERO);
@@ -577,30 +576,31 @@
    }

    private Bikes dealBikesByParam(Locks model) {
        QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
        wrapper.lambda().eq(Bikes::getLockId, model.getCode());
        wrapper.lambda().eq(Bikes::getSiteId, model.getSiteId());
        Bikes bikes = bikesMapper.selectOne(wrapper.last("limit 1"));
        if(bikes != null ) {
            if (  StringUtils.equals(model.getBikeCode(), bikes.getCode())){
                //如果绑定车辆信息发生编号，更换绑定关系
                UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
                updateWrapper.lambda().set(Bikes::getId, bikes.getId());
                updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
                updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
                //更新自行站点锁头绑定自行车信息
                bikesMapper.updateById(bikes);
            }
        }else{
            if(StringUtils.isNotBlank(model.getBikeCode())){
                UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
                updateWrapper.lambda().set(Bikes::getCode, null );
                updateWrapper.lambda().set(Bikes::getParamId, null );
                updateWrapper.lambda().set(Bikes::getEditDate, new Date() );
                updateWrapper.lambda().eq(Bikes::getCode, model.getCode() );
            updateWrapper.lambda().eq(Bikes::getCode, model.getBikeCode() );
                //清空原来的自行车绑定关系
                bikesMapper.update(null, updateWrapper);
            }

        QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
        wrapper.lambda().eq(Bikes::getLockId, model.getCode());
        wrapper.lambda().eq(Bikes::getSiteId, model.getSiteId());
        Bikes bikes = bikesMapper.selectOne(wrapper.last("limit 1"));
        if(bikes != null ) {
            if ( !StringUtils.equals(model.getBikeCode(), bikes.getCode())){
                //如果绑定车辆信息发生编号，更换绑定关系
                UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
                updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
                updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
                updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
                //更新自行站点锁头绑定自行车信息
                bikesMapper.update(null,updateWrapper);
            }
        }else{
            bikes = new Bikes();
            bikes.setId(Constants.getUUID());
            bikes.setIsdeleted(Constants.ZERO);
@@ -625,7 +625,7 @@
            return  null;
        }
        String type = bikeCode.substring(0,1);
        if(Constants.BIKE_TYPE.contains(type)){
        if(!Constants.BIKE_TYPE.contains(type)){
            return null;
        }
        BaseParam param = new BaseParam();
@@ -679,7 +679,6 @@
            updateWrapper.lambda().set(Locks::getStatus, locks.getStatus() );
            updateWrapper.lambda().set(Locks::getEditDate, new Date() );
            updateWrapper.lambda().set(Locks::getIsdeleted, Constants.ZERO);

            locksMapper.update(null,updateWrapper);
        }
        model.setSites(sites);