#获取正常还车

jiaosong

2023-10-18 c96b05ab329834d16ec2aad7a35e66dfa02511c1

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

@@ -221,6 +221,9 @@
        queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
        queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
        queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
        queryWrapper.eq(MemberRides::getBackType, Constants.ZERO);
        queryWrapper.in(MemberRides::getStatus,
                Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
        queryWrapper
                .selectAs(MemberRides::getId,MemberRidesDTO::getId)
                .selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
@@ -232,12 +235,14 @@
                .selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
                .selectAs(MemberRides::getRentLockId,MemberRidesDTO::getRentLockId)
                .selectAs(MemberRides::getRentSiteId,MemberRidesDTO::getRentSiteId)
                .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
                .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate)
                .selectAs(MemberRides::getBackSiteId,MemberRidesDTO::getBackSiteId)
                .selectAs(MemberRides::getBackLockId,MemberRidesDTO::getBackLockId);
        return queryWrapper;
    }

    @Override
    public String getOnlineBike(String memberId){
    public MemberRides getOnlineBike(String memberId){
        MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()
                .eq("isdeleted", Constants.ZERO)
                .eq("member_id",memberId)
@@ -247,7 +252,7 @@
        if(Objects.isNull(memberRides)){
            return null;
        }
        return memberRides.getBikeCode();
        return memberRides;
    }

    /**
@@ -472,7 +477,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);
@@ -573,30 +577,31 @@
    }

    private Bikes dealBikesByParam(Locks model) {
        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.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())){
            if ( !StringUtils.equals(model.getBikeCode(), bikes.getCode())){
                //如果绑定车辆信息发生编号，更换绑定关系
                UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
                updateWrapper.lambda().set(Bikes::getId, bikes.getId());
                updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
                updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
                updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
                //更新自行站点锁头绑定自行车信息
                bikesMapper.updateById(bikes);
                bikesMapper.update(null,updateWrapper);
            }
        }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() );
                //清空原来的自行车绑定关系
                bikesMapper.update(null, updateWrapper);
            }
            bikes = new Bikes();
            bikes.setId(Constants.getUUID());
            bikes.setIsdeleted(Constants.ZERO);
@@ -621,7 +626,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();
@@ -675,7 +680,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);